diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:35:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:40:51 +0200 |
| commit | d1df28f8e5b98be01417ffc1032020415390f2a0 (patch) | |
| tree | 0e2024acd74c6ce3fb4614eadb04abe632835f71 /pkgs/development/libraries/libiberty/default.nix | |
| parent | 056b5a1a5f2a4096dd39db2265e5ca369c03ec15 (diff) | |
| parent | c55cfe0cb3425fb926219cf7dde8714f3d143744 (diff) | |
Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
Diffstat (limited to 'pkgs/development/libraries/libiberty/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libiberty/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index 6a68b5610da28..c3dc3a4e8526c 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, staticBuild ? false }: stdenv.mkDerivation rec { version = "4.9.3"; @@ -11,11 +11,16 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/libiberty"; - enable_shared = 1; + enable_shared = !staticBuild; installPhase = '' - mkdir -p $out/lib - cp pic/libiberty.a $out/lib/libiberty_pic.a + mkdir -p $out/lib $out/include + cp ../include/libiberty.h $out/include/ + if [ -z "$enabled_shared" ]; then + cp libiberty.a $out/lib/libiberty.a + else + cp pic/libiberty.a $out/lib/libiberty_pic.a + fi ''; meta = with stdenv.lib; { |