diff options
| author | Jude Taylor <me@jude.bio> | 2015-06-18 13:40:17 -0700 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2015-06-18 13:41:34 -0700 |
| commit | e26b421b71d442949839c4fc65090219f7c491ab (patch) | |
| tree | e156c2cc9985d4fb18e9dab9c9aceb1ccbb85395 /pkgs | |
| parent | 61596bf405de245c71630101869ea3f4e8f8a20a (diff) | |
| download | nixlib-e26b421b71d442949839c4fc65090219f7c491ab.tar nixlib-e26b421b71d442949839c4fc65090219f7c491ab.tar.gz nixlib-e26b421b71d442949839c4fc65090219f7c491ab.tar.bz2 nixlib-e26b421b71d442949839c4fc65090219f7c491ab.tar.lz nixlib-e26b421b71d442949839c4fc65090219f7c491ab.tar.xz nixlib-e26b421b71d442949839c4fc65090219f7c491ab.tar.zst nixlib-e26b421b71d442949839c4fc65090219f7c491ab.zip | |
fix conditionals for bootstrap sed calls
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libedit/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/archivers/sharutils/default.nix | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 5adef716eb0f..167aa2068655 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ] else null; postInstall = '' - sed -i s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc + sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.nativeLibc) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc ''; configureFlags = [ "--enable-widec" ]; diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index bfeda5085b68..cc9618c4dcc4 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -9,10 +9,12 @@ stdenv.mkDerivation rec { }; preConfigure = - '' + let needSedSpace = ((stdenv.isFreeBSD || stdenv.isOpenBSD) && stdenv.cc.nativeTools) + || (stdenv.isDarwin && stdenv.cc.nativeLibc); + in '' # Fix for building on Glibc 2.16. Won't be needed once the # gnulib in sharutils is updated. - sed -i ${stdenv.lib.optionalString ((stdenv.isFreeBSD || stdenv.isOpenBSD) && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h + sed -i ${stdenv.lib.optionalString needSedSpace "''"} '/gets is a security hole/d' lib/stdio.in.h ''; # GNU Gettext is needed on non-GNU platforms. |