diff options
author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2017-07-22 21:20:07 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-22 21:20:07 -0500 |
commit | 9af77826a97feb9798f700d64cd467864945875c (patch) | |
tree | 34ef7cd57dab11e7c9fd0032b6822a8781c8c10c /pkgs/tools/graphics | |
parent | f68affed0a26f9935d7b8e11af27ac46a0110435 (diff) | |
parent | 101e0998e14ee01f5fd1ff86fa705f6cfe31cf27 (diff) | |
download | nixlib-9af77826a97feb9798f700d64cd467864945875c.tar nixlib-9af77826a97feb9798f700d64cd467864945875c.tar.gz nixlib-9af77826a97feb9798f700d64cd467864945875c.tar.bz2 nixlib-9af77826a97feb9798f700d64cd467864945875c.tar.lz nixlib-9af77826a97feb9798f700d64cd467864945875c.tar.xz nixlib-9af77826a97feb9798f700d64cd467864945875c.tar.zst nixlib-9af77826a97feb9798f700d64cd467864945875c.zip |
Merge pull request #27522 from ttuegel/bugfix/staging/stdenv
Fixes for various bugs introduced by stdenv update in staging
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/argyllcms/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 3c7af45f81dd..3cdb4497baf1 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -84,6 +84,8 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "-j 3" "-j $NIX_BUILD_CORES" # Remove tiff, jpg and png to be sure the nixpkgs-provided ones are used rm -rf tiff jpg png + + unset AR ''; buildInputs = [ |