about summary refs log tree commit diff
path: root/pkgs/tools/misc/colord
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2017-11-12 03:30:35 +0100
committerJan Tojnar <jtojnar@gmail.com>2017-11-26 03:10:58 +0100
commitfabc930dddcfb6dd3dfc6e3b2536219f559353e0 (patch)
treed385583fd104b5f5bea2d9ae2b51b9483478f9ee /pkgs/tools/misc/colord
parentd76faaa2d7f28383940bf89accbeb0b8f266fc74 (diff)
downloadnixlib-fabc930dddcfb6dd3dfc6e3b2536219f559353e0.tar
nixlib-fabc930dddcfb6dd3dfc6e3b2536219f559353e0.tar.gz
nixlib-fabc930dddcfb6dd3dfc6e3b2536219f559353e0.tar.bz2
nixlib-fabc930dddcfb6dd3dfc6e3b2536219f559353e0.tar.lz
nixlib-fabc930dddcfb6dd3dfc6e3b2536219f559353e0.tar.xz
nixlib-fabc930dddcfb6dd3dfc6e3b2536219f559353e0.tar.zst
nixlib-fabc930dddcfb6dd3dfc6e3b2536219f559353e0.zip
colord: move the DBus configuration to /etc
NixOS generates /etc/dbus-1/system.conf including the configuration
of all the dbus derivations. Unfortunately, colord places the configuration
into $out/share instead of expected $out/etc.

This commit patches colord to use the expected path.

https://github.com/hughsie/colord/issues/61
Diffstat (limited to 'pkgs/tools/misc/colord')
-rw-r--r--pkgs/tools/misc/colord/fix-build-paths.patch7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/misc/colord/fix-build-paths.patch b/pkgs/tools/misc/colord/fix-build-paths.patch
index 7eb66a0b34be..3761fee89838 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 @@