diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 9af7de8b35e4..043ea44bb8c8 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,18 +1,16 @@ { stdenv, fetchurl, bash-completion , glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus -, gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_38 +, gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_40 , libgudev, sane-backends, udev, gnome3, makeWrapper }: stdenv.mkDerivation rec { - name = "colord-1.4.1"; + name = "colord-1.4.2"; src = fetchurl { url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; - sha256 = "0m854clp8szvq38z16jpazzlqfb3lb3icxcfnsisfrc25748y1ib"; + sha256 = "19zc9gldz469jshl16av7na459kwr5nhvs2pz98xm5lw582xaw2c"; }; - enableParallelBuilding = true; - mesonFlags = [ "-Denable-sane=true" "-Denable-vala=true" @@ -23,19 +21,20 @@ stdenv.mkDerivation rec { "-Denable-docs=false" ]; - patches = [ - ./fix-build-paths.patch - ]; + nativeBuildInputs = [ meson pkgconfig vala_0_40 ninja gettext libxml2 gobjectIntrospection makeWrapper ]; - 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 ]; + buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus bash-completion argyllcms libgudev sane-backends ]; postInstall = '' glib-compile-schemas $out/share/glib-2.0/schemas ''; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + PKG_CONFIG_SYSTEMD_TMPFILESDIR = "${placeholder "out"}/lib/tmpfiles.d"; + PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions"; + PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + postFixup = '' wrapProgram "$out/libexec/colord-session" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \ diff --git a/pkgs/tools/misc/colord/fix-build-paths.patch b/pkgs/tools/misc/colord/fix-build-paths.patch deleted file mode 100644 index d4bf0f36ad74..000000000000 --- a/pkgs/tools/misc/colord/fix-build-paths.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- a/contrib/session-helper/meson.build -+++ b/contrib/session-helper/meson.build -@@ -21,7 +21,7 @@ - output : 'colord-session.service', - configuration : con2, - install: true, -- install_dir: systemd.get_pkgconfig_variable('systemduserunitdir'), -+ install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'user'), - ) - endif - ---- a/data/meson.build -+++ b/data/meson.build -@@ -8,13 +8,13 @@ - - if get_option('enable-systemd') - install_data('colord.conf', -- install_dir: systemd.get_pkgconfig_variable('tmpfilesdir') -+ install_dir: join_paths(get_option('prefix'), 'lib', 'tmpfiles.d') - ) - endif - - if get_option('enable-bash-completion') - install_data('colormgr', -- install_dir: bash_completion.get_pkgconfig_variable('completionsdir') -+ install_dir: join_paths(get_option('prefix'), 'etc', 'bash_completion.d') - ) - endif - -@@ -31,7 +31,7 @@ - output : 'colord.service', - configuration : con2, - install: true, -- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'), -+ install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'system'), - ) - 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 @@ - subdir('policy') - subdir('rules') - subdir('src') -- --meson.add_install_script('meson_post_install.sh', -- localstatedir, get_option('with-daemon-user')) ---- a/rules/meson.build -+++ b/rules/meson.build -@@ -9,5 +9,5 @@ - sensor_rules_in, - '95-cd-devices.rules', - ], -- 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,