diff options
| author | Linus Heckemann <git@sphalerite.org> | 2017-06-25 17:59:23 +0100 |
|---|---|---|
| committer | Tom Hunger <tehunger@gmail.com> | 2017-08-28 15:32:49 +0100 |
| commit | b73e3b6095e5d8d952682d4b868e9ac7f633f0c2 (patch) | |
| tree | b4dc3e28424b6c9a7026f96a02b1c81b4f5e2f4f /pkgs/tools/misc | |
| parent | 9eafe6706d119d124d2ef5b34876e8e54e8a7559 (diff) | |
GNOME: 3.22 -> 3.24
This is a squash commit of the joint work from: * Jan Tojnar (@jtojnar) * Linus Heckemann (@lheckemann) * Ryan Mulligan (@ryantm) * romildo (@romildo) * Tom Hunger (@teh)
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/colord/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 222b04db0d0c2..46f3786a6df38 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, bash-completion , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus -, gtk_doc, gobjectIntrospection, argyllcms +, gtk_doc, gobjectIntrospection, argyllcms, autoreconfHook , libgudev, sane-backends }: stdenv.mkDerivation rec { @@ -10,9 +10,16 @@ stdenv.mkDerivation rec { url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m"; }; + nativeBuildInputs = [ autoreconfHook intltool ]; enableParallelBuilding = true; + # Version mismatch requires intltoolize to overwrite + # with newer version. + preConfigure = '' + intltoolize --force + ''; + configureFlags = [ "--enable-sane" "--with-udevrulesdir=$(out)/lib/udev/rules.d" @@ -21,12 +28,13 @@ stdenv.mkDerivation rec { "--disable-bash-completion" ]; + # don't touch /var at install time, colord creates what it needs at runtime postPatch = '' sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in} ''; - buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection + buildInputs = [ glib polkit pkgconfig gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection bash-completion argyllcms libgudev sane-backends ]; postInstall = '' |