rhythmbox: 3.4.4 → 3.4.5
https://gitlab.gnome.org/GNOME/rhythmbox/-/compare/v3.4.4...v3.4.5 - Switched to Meson, which enabled all features by default.
This commit is contained in:
parent
9674b8dbb9
commit
c70641c8d9
|
@ -1,17 +1,30 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, fetchFromGitLab
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchurl
|
||||||
|
, fetchpatch
|
||||||
|
, pkg-config
|
||||||
|
, meson
|
||||||
|
, ninja
|
||||||
|
, fetchFromGitLab
|
||||||
, python3
|
, python3
|
||||||
, perl
|
, vala
|
||||||
, perlPackages
|
, glib
|
||||||
, gtk3
|
, gtk3
|
||||||
, intltool
|
|
||||||
, libpeas
|
, libpeas
|
||||||
, libsoup
|
, libsoup
|
||||||
|
, libxml2
|
||||||
, libsecret
|
, libsecret
|
||||||
, libnotify
|
, libnotify
|
||||||
, libdmapsharing
|
, libdmapsharing
|
||||||
, gnome
|
, gnome
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, totem-pl-parser
|
, totem-pl-parser
|
||||||
|
, libgudev
|
||||||
|
, libgpod
|
||||||
|
, libmtp
|
||||||
|
, lirc
|
||||||
|
, brasero
|
||||||
|
, grilo
|
||||||
, tdb
|
, tdb
|
||||||
, json-glib
|
, json-glib
|
||||||
, itstool
|
, itstool
|
||||||
|
@ -19,38 +32,32 @@
|
||||||
, gst_all_1
|
, gst_all_1
|
||||||
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
|
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
|
||||||
}:
|
}:
|
||||||
let
|
|
||||||
|
|
||||||
# The API version of libdmapsharing required by rhythmbox 3.4.4 is 3.0.
|
stdenv.mkDerivation rec {
|
||||||
|
|
||||||
# This PR would solve the issue:
|
|
||||||
# https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/12
|
|
||||||
# Unfortunately applying this patch produces a rhythmbox which
|
|
||||||
# cannot fetch data from DAAP shares.
|
|
||||||
|
|
||||||
libdmapsharing_3 = libdmapsharing.overrideAttrs (old: rec {
|
|
||||||
version = "2.9.41";
|
|
||||||
src = fetchFromGitLab {
|
|
||||||
domain = "gitlab.gnome.org";
|
|
||||||
owner = "GNOME";
|
|
||||||
repo = old.pname;
|
|
||||||
rev = "${lib.toUpper old.pname}_${lib.replaceStrings ["."] ["_"] version}";
|
|
||||||
sha256 = "05kvrzf0cp3mskdy6iv7zqq24qdczl800q2dn1h4bk3d9wchgm4p";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
|
||||||
pname = "rhythmbox";
|
pname = "rhythmbox";
|
||||||
version = "3.4.4";
|
version = "3.4.5";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "142xcvw4l19jyr5i72nbnrihs953pvrrzcbijjn9dxmxszbv03pf";
|
sha256 = "l+u8YPN4sibaRbtEbYmQL26hgx4j8Q76ujZVk7HnTyo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Fix stuff linking against rhythmdb not finding libxml headers
|
||||||
|
# included by rhythmdb.h header.
|
||||||
|
# https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/147
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://gitlab.gnome.org/GNOME/rhythmbox/-/commit/7e8c7b803a45b7badf350132f8e78e3d75b99a21.patch";
|
||||||
|
sha256 = "5CE/NVlmx7FItNJCVQxx+x0DCYhUkAi/UuksfAiyWBg=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
intltool perl perlPackages.XMLParser
|
meson
|
||||||
|
ninja
|
||||||
|
vala
|
||||||
|
glib
|
||||||
itstool
|
itstool
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
];
|
];
|
||||||
|
@ -58,13 +65,20 @@ in stdenv.mkDerivation rec {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
python3
|
python3
|
||||||
libsoup
|
libsoup
|
||||||
|
libxml2
|
||||||
tdb
|
tdb
|
||||||
json-glib
|
json-glib
|
||||||
|
|
||||||
|
glib
|
||||||
gtk3
|
gtk3
|
||||||
libpeas
|
libpeas
|
||||||
totem-pl-parser
|
totem-pl-parser
|
||||||
gnome.adwaita-icon-theme
|
libgudev
|
||||||
|
libgpod
|
||||||
|
libmtp
|
||||||
|
lirc
|
||||||
|
brasero
|
||||||
|
grilo
|
||||||
|
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
python3.pkgs.pygobject3
|
python3.pkgs.pygobject3
|
||||||
|
@ -76,16 +90,14 @@ in stdenv.mkDerivation rec {
|
||||||
gst_all_1.gst-plugins-ugly
|
gst_all_1.gst-plugins-ugly
|
||||||
gst_all_1.gst-libav
|
gst_all_1.gst-libav
|
||||||
|
|
||||||
libdmapsharing_3 # necessary for daap support
|
libdmapsharing # for daap support
|
||||||
libsecret
|
libsecret
|
||||||
libnotify
|
libnotify
|
||||||
] ++ gst_plugins;
|
] ++ gst_plugins;
|
||||||
|
|
||||||
configureFlags = [
|
postInstall = ''
|
||||||
"--enable-daap"
|
glib-compile-schemas "$out/share/glib-2.0/schemas"
|
||||||
"--enable-libnotify"
|
'';
|
||||||
"--with-libsecret"
|
|
||||||
];
|
|
||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
gappsWrapperArgs+=(
|
gappsWrapperArgs+=(
|
||||||
|
@ -93,8 +105,6 @@ in stdenv.mkDerivation rec {
|
||||||
)
|
)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
updateScript = gnome.updateScript {
|
updateScript = gnome.updateScript {
|
||||||
packageName = pname;
|
packageName = pname;
|
||||||
|
|
Loading…
Reference in a new issue