public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

colord: fixup build after automake update #28232

Browse Source 
It was enough to switch the order of patching to avoid the need to
autoreconf.
This commit is contained in:
Vladimír Čunát 2017-08-20 09:43:05 +02:00
parent bb24434904
commit 2d55ee40fa
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/misc/colord/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchzip, fetchgit, bash-completion { stdenv, fetchzip, bash-completion
, glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus , 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 }: , libgudev, sane-backends }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -23,12 +23,11 @@ stdenv.mkDerivation rec {
# don't touch /var at install time, colord creates what it needs at runtime # don't touch /var at install time, colord creates what it needs at runtime
postPatch = '' postPatch = ''
sed -i -e "s|if test -w .*;|if false;|" src/Makefile.in sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in}
sed -i -e "s|if test -w .*;|if false;|" src/Makefile.am
''; '';
buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection 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 = '' postInstall = ''
mkdir -p $out/etc/bash_completion.d mkdir -p $out/etc/bash_completion.d