diff options
| -rw-r--r-- | pkgs/development/libraries/libedit/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/darwin/trivial-bootstrap.sh | 3 | ||||
| -rw-r--r-- | pkgs/tools/archivers/sharutils/default.nix | 13 |
4 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 167aa2068655..5adef716eb0f 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 ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.nativeLibc) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc + sed -i s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc ''; configureFlags = [ "--enable-widec" ]; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 98fc35074c2e..9ad2c8504d1a 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -106,7 +106,7 @@ rec { inherit system config; inherit (stage1.stdenv) shell fetchurlBoot preHook cc; - initialPath = [ stage1.pkgs.xz ] ++ stage1.stdenv.initialPath; + initialPath = [ stage1.pkgs.xz stage1.pkgs.gnused ] ++ stage1.stdenv.initialPath; }; pkgs = allPackages { inherit system platform; diff --git a/pkgs/stdenv/darwin/trivial-bootstrap.sh b/pkgs/stdenv/darwin/trivial-bootstrap.sh index 0915b378d4f0..487f14886587 100644 --- a/pkgs/stdenv/darwin/trivial-bootstrap.sh +++ b/pkgs/stdenv/darwin/trivial-bootstrap.sh @@ -12,6 +12,7 @@ cd $out/bin ln -s $mkdir ln -s /bin/sh ln -s /bin/cp +ln -s /bin/dd ln -s /bin/mv ln -s /bin/rm ln -s /bin/ls @@ -63,4 +64,4 @@ ln -s /usr/bin/which ln -s /usr/bin/install ln -s /usr/bin/basename ln -s /usr/bin/dirname -ln -s /usr/bin/readlink \ No newline at end of file +ln -s /usr/bin/readlink diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index cc9618c4dcc4..a7135346d2fc 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -8,14 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1mallg1gprimlggdisfzdmh1xi676jsfdlfyvanlcw72ny8fsj3g"; }; - 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 needSedSpace "''"} '/gets is a security hole/d' lib/stdio.in.h - ''; + preConfigure = '' + # 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 + ''; # GNU Gettext is needed on non-GNU platforms. buildInputs = [ gettext coreutils ]; |