jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnome.rygel: 0.40.1 → 0.40.2

Browse Source
This commit is contained in:
Jan Tojnar 2021-10-01 23:08:07 +00:00
parent 9819e2dd88
commit 34b2bfd81a
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch
View File

@ -1,8 +1,8 @@
diff --git a/meson.build b/meson.build
index 4aa683d6..a930d533 100644
index 8af2fcf9..0e318307 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,11 @@ if not get_option('uninstalled')
@@ -22,7 +22,11 @@ if not get_option('uninstalled')
rygel_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'rygel')
rygel_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'),
'rygel')
@ -15,7 +15,7 @@ index 4aa683d6..a930d533 100644
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, 'presets')
@@ -55,7 +59,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir)
@@ -57,7 +61,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir)
conf.set_quoted('PLUGIN_DIR', rygel_plugindir)
conf.set_quoted('BIG_ICON_DIR', rygel_bigicondir)
conf.set_quoted('SMALL_ICON_DIR', rygel_smallicondir)
@ -25,14 +25,11 @@ index 4aa683d6..a930d533 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 cb604c4e..1b049b77 100644
index fd04776a..3dee43ba 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,6 +1,7 @@
@@ -1,3 +1,4 @@
+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
option('uninstalled', type: 'boolean', value: 'false', description: 'Run Rygel from build directory only')
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', 'tracker3'])
option('engines', type : 'array', choices : ['simple', 'gstreamer'])
option('examples', type : 'boolean', value : 'true')
option('man_pages', type: 'boolean', value: 'true', description: 'Build the man pages')

14
pkgs/desktops/gnome/core/rygel/default.nix
View File

@ -28,16 +28,20 @@
stdenv.mkDerivation rec {
pname = "rygel";
version = "0.40.1";
version = "0.40.2";
# TODO: split out lib
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "QkDXd1mcjNCeZ9pEzLOV0KbceEedgJzWIZgixbVooy0=";
sha256 = "yejHNiltIsTe/pWXJ6KdMUN7vSt6oMZHDWviQBEFBpc=";
};
patches = [
./add-option-for-installation-sysconfdir.patch
];
nativeBuildInputs = [
meson
ninja
@ -78,16 +82,10 @@ 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;
patches = [
./add-option-for-installation-sysconfdir.patch
];
postPatch = ''
patchShebangs data/xml/process-xml.py
'';