diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-20 09:43:05 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-20 09:43:05 +0200 |
| commit | 2d55ee40fa8ce0eb0b8258ae6282b7b904e31e0d (patch) | |
| tree | 1f1f825e86da1472b09cbc468e16f6d23269aa2b /pkgs/tools/misc/colord | |
| parent | bb244349041d76bb5ce539aa8e1df2d9255f536d (diff) | |
| download | nixlib-2d55ee40fa8ce0eb0b8258ae6282b7b904e31e0d.tar nixlib-2d55ee40fa8ce0eb0b8258ae6282b7b904e31e0d.tar.gz nixlib-2d55ee40fa8ce0eb0b8258ae6282b7b904e31e0d.tar.bz2 nixlib-2d55ee40fa8ce0eb0b8258ae6282b7b904e31e0d.tar.lz nixlib-2d55ee40fa8ce0eb0b8258ae6282b7b904e31e0d.tar.xz nixlib-2d55ee40fa8ce0eb0b8258ae6282b7b904e31e0d.tar.zst nixlib-2d55ee40fa8ce0eb0b8258ae6282b7b904e31e0d.zip | |
colord: fixup build after automake update #28232
It was enough to switch the order of patching to avoid the need to autoreconf.
Diffstat (limited to 'pkgs/tools/misc/colord')
| -rw-r--r-- | pkgs/tools/misc/colord/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 6dc2c371e460..65c71d349f04 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, fetchgit, bash-completion +{ stdenv, fetchzip, bash-completion , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus -, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection, argyllcms +, gtk_doc, gobjectIntrospection, argyllcms , libgudev, sane-backends }: stdenv.mkDerivation rec { @@ -23,12 +23,11 @@ stdenv.mkDerivation rec { # don't touch /var at install time, colord creates what it needs at runtime postPatch = '' - sed -i -e "s|if test -w .*;|if false;|" src/Makefile.in - sed -i -e "s|if test -w .*;|if false;|" src/Makefile.am + 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 - bash-completion argyllcms automake autoconf libgudev sane-backends ]; + bash-completion argyllcms libgudev sane-backends ]; postInstall = '' mkdir -p $out/etc/bash_completion.d |