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

2016-04-18 13:00:40 +00:00
parent 3e68106afd 0729f60697
commit d020caa5b2
1369 changed files with 35810 additions and 10571 deletions
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
    sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure
  '';

+  outputs = [ "dev" "out" ];
+
  propagatedBuildInputs = [ xz ];

  preInstall = ''
@@ -29,7 +31,7 @@ stdenv.mkDerivation rec {

  postInstall = ''
    find $out -name \*.la | while read file; do
-      sed -i 's,-llzma,${xz}/lib/liblzma.la,' $file
+      sed -i 's,-llzma,${xz.out}/lib/liblzma.la,' $file
    done
  '';