Merge commit '2e56ba' from staging into master

2018-01-17 12:50:46 +02:00
parent 5ab499d2c7 2e56ba6fbd
commit 67c73b4e64
97 changed files with 231 additions and 305 deletions
@@ -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;