summary refs log tree commit diff
path: root/pkgs/tools/archivers
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-01-17 12:50:46 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2018-01-17 12:50:46 +0200
commit67c73b4e64b01657ce9ea9bb2d8c015754ef3150 (patch)
tree7358277e028232ad5f37da0892ee2bb6860373b5 /pkgs/tools/archivers
parent5ab499d2c753209381e721a66204fe7869d6dac9 (diff)
parent2e56ba6fbdd70ed6b9244df816670b9a94da0824 (diff)
downloadnixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar
nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.gz
nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.bz2
nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.lz
nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.xz
nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.zst
nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.zip
Merge commit '2e56ba' from staging into master
Diffstat (limited to 'pkgs/tools/archivers')
-rw-r--r--pkgs/tools/archivers/sharutils/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index 9f161ac7525a..022814689428 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
     in ''
       substituteInPlace tests/shar-1 --replace '${shar_sub}' '${shar_sub} -s submitter'
       substituteInPlace tests/shar-2 --replace '${shar_sub}' '${shar_sub} -s submitter'
+
+      substituteInPlace intl/Makefile.in --replace "AR = ar" ""
     '';
 
   doCheck = true;