diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-29 10:00:30 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-29 10:02:40 +0100 |
commit | 5f020d5627789ce77b2997e360ece984c261bce7 (patch) | |
tree | ad2398b7aadcb52e5ef02df8dd961874edb7c816 /pkgs/tools/misc | |
parent | 0e6ca9e85d76ddb2757d05119f07f4b2fe32b689 (diff) | |
parent | 8b53b2ec2c7ec4d87b8d27df7fe0c85812e29bf5 (diff) | |
download | nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar.gz nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar.bz2 nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar.lz nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar.xz nixlib-5f020d5627789ce77b2997e360ece984c261bce7.tar.zst nixlib-5f020d5627789ce77b2997e360ece984c261bce7.zip |
Merge branch 'staging'
There are security fixes in multiple packages /cc #32117, so I'm merging a little earlier, with a few thousand jobs still not finished on Hydra for x86_64-darwin and aarch64-linux.
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/colord/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/misc/colord/fix-build-paths.patch | 18 |
2 files changed, 26 insertions, 2 deletions
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 020599e17a81..9af7de8b35e4 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bash-completion , glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus , gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_38 -, libgudev, sane-backends }: +, libgudev, sane-backends, udev, gnome3, makeWrapper }: stdenv.mkDerivation rec { name = "colord-1.4.1"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ./fix-build-paths.patch ]; - nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection ]; + nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection makeWrapper ]; buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus bash-completion argyllcms libgudev sane-backends ]; @@ -36,6 +36,12 @@ stdenv.mkDerivation rec { glib-compile-schemas $out/share/glib-2.0/schemas ''; + postFixup = '' + wrapProgram "$out/libexec/colord-session" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" + ''; + meta = { description = "System service to manage, install and generate color profiles to accurately color manage input and output devices"; homepage = https://www.freedesktop.org/software/colord/; diff --git a/pkgs/tools/misc/colord/fix-build-paths.patch b/pkgs/tools/misc/colord/fix-build-paths.patch index 7eb66a0b34be..d4bf0f36ad74 100644 --- a/pkgs/tools/misc/colord/fix-build-paths.patch +++ b/pkgs/tools/misc/colord/fix-build-paths.patch @@ -36,6 +36,13 @@ ) endif +@@ -50,5 +50,5 @@ + output : 'org.freedesktop.ColorManager.conf', + configuration : con2, + install: true, +- install_dir: join_paths(get_option('datadir'), 'dbus-1', 'system.d') , ++ install_dir: join_paths(get_option('prefix'), 'etc', 'dbus-1', 'system.d') , + ) --- a/meson.build +++ b/meson.build @@ -258,6 +258,3 @@ @@ -54,3 +61,14 @@ - install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') + install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d') ) +--- a/src/plugins/meson.build ++++ b/src/plugins/meson.build +@@ -66,7 +66,7 @@ + install_dir: join_paths(get_option('libdir'), 'colord-plugins'), + c_args : [ + cargs, +- '-DCOLORD_SANE_BINARY="' + join_paths(get_option('libexecdir'), 'colord-sane' + '"'), ++ '-DCOLORD_SANE_BINARY="' + join_paths(get_option('prefix'), get_option('libexecdir'), 'colord-sane' + '"'), + ], + dependencies : [ + gio, |