Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-02-19 21:16:14 +00:00
parent ea84b3a915 5ea21d69f5
commit bc21db3692
308 changed files with 13223 additions and 4459 deletions
@@ -7,6 +7,7 @@ stdenv.mkDerivation (rec {
    url = "mirror://gnu/gettext/${name}.tar.gz";
    sha256 = "0pb9vp4ifymvdmc31ks3xxcnfqgzj8shll39czmk8c1splclqjzd";
  };
+  patches = [ ./absolute-paths.diff ];

  outputs = [ "out" "doc" ];

@@ -30,7 +31,8 @@ stdenv.mkDerivation (rec {
        "gt_cv_func_CFLocaleCopyCurrent=no"
      ]);

-  patchPhase = ''
+  postPatch = ''
+   substituteAllInPlace gettext-runtime/src/gettext.sh.in
   substituteInPlace gettext-tools/projects/KDE/trigger --replace "/bin/pwd" pwd
   substituteInPlace gettext-tools/projects/GNOME/trigger --replace "/bin/pwd" pwd
   substituteInPlace gettext-tools/src/project-id --replace "/bin/pwd" pwd