diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/rygel')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch | 8 | ||||
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch index 4259f93eb24c..6fe651b9cbb4 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch @@ -1,5 +1,5 @@ diff --git a/meson.build b/meson.build -index 209d4187..58580980 100644 +index 4aa683d6..a930d533 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,11 @@ if not get_option('uninstalled') @@ -14,7 +14,7 @@ index 209d4187..58580980 100644 + endif rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins') rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines') - rygel_presetdir = join_paths(rygel_datadir, 'rygel', 'presets') + rygel_presetdir = join_paths(rygel_datadir, 'presets') @@ -55,7 +59,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir) conf.set_quoted('PLUGIN_DIR', rygel_plugindir) conf.set_quoted('BIG_ICON_DIR', rygel_bigicondir) @@ -25,7 +25,7 @@ index 209d4187..58580980 100644 conf.set_quoted('MX_EXTRACT_PATH', join_paths(rygel_libexecdir, 'mx-extract')) conf.set_quoted('DESKTOP_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'applications')) diff --git a/meson_options.txt b/meson_options.txt -index f09cac58..ff11c548 100644 +index cb604c4e..1b049b77 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,7 @@ @@ -33,6 +33,6 @@ index f09cac58..ff11c548 100644 option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation') option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path') +option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') - option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker']) + option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker', 'tracker3']) option('engines', type : 'array', choices : ['simple', 'gstreamer']) option('examples', type : 'boolean', value : 'true') diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix index 529091e5fd61..f7ce3387fc07 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.38.4"; + version = "0.40.0"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rm1m1z8rcvyj9873wqcz5i3qdg8j6gv6k1p01xifk0y9phg7rzc"; + sha256 = "0xrbdsgm78h3g4qcvq2p8k70q31x9xdbb35bixz36q6h9s1wqznn"; }; nativeBuildInputs = [ @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { shared-mime-info ] ++ (with gst_all_1; [ gstreamer + gst-editing-services gst-plugins-base gst-plugins-good gst-plugins-bad @@ -77,6 +78,8 @@ stdenv.mkDerivation rec { "-Dapi-docs=false" "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" + # Build all plug-ins except for tracker 2 + "-Dplugins=external,gst-launch,lms,media-export,mpris,playbin,ruih,tracker3" ]; doCheck = true; |