diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-05-16 14:54:28 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-05-16 14:54:28 +0000 |
commit | 62b0dddf0e8b72a77e60c90b0d2791808c6b0df5 (patch) | |
tree | 9ab853085cdde52b25a11796809b5504c82bc309 | |
parent | 41291a5b267f9855b55c30c9d7896a103848098a (diff) | |
download | nixpkgs-62b0dddf0e8b72a77e60c90b0d2791808c6b0df5.tar nixpkgs-62b0dddf0e8b72a77e60c90b0d2791808c6b0df5.tar.gz nixpkgs-62b0dddf0e8b72a77e60c90b0d2791808c6b0df5.tar.bz2 nixpkgs-62b0dddf0e8b72a77e60c90b0d2791808c6b0df5.tar.lz nixpkgs-62b0dddf0e8b72a77e60c90b0d2791808c6b0df5.tar.xz nixpkgs-62b0dddf0e8b72a77e60c90b0d2791808c6b0df5.tar.zst nixpkgs-62b0dddf0e8b72a77e60c90b0d2791808c6b0df5.zip |
* Fix Darwin evaluation errors.
svn path=/nixpkgs/trunk/; revision=8709
-rw-r--r-- | pkgs/applications/version-management/git/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/iputils/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/libcap/default.nix | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 4616fb4432c..63c7b8346b3 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { buildInputs = [curl openssl zlib expat]; preBuild = " - makeFlagsArray=(prefix=$out PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.bash}/bin/sh) + makeFlagsArray=(prefix=$out PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}/bin/sh) "; } diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 39df4dd8cfe..95066cb78e0 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, kernelHeaders, glibc}: +assert stdenv.isLinux; + stdenv.mkDerivation { name = "iputils"; builder = ./builder.sh; diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index a0adb3813fd..aa265cae3ef 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl}: +assert stdenv.isLinux; + stdenv.mkDerivation { name = "libcap-1.10"; src = fetchurl { |