Author: shlevy
Date: Sun Jan 15 22:52:29 2012
New Revision: 31575
URL: https://nixos.org/websvn/nix/?rev=31575&sc=1
Log:
Make a sepseparate directory for darwin's stdenv
Added:
nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/darwin/
- copied from r31574,
nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/nix/
Modified:
nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/darwin/default.nix
nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/darwin/prehook.sh
nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/default.nix
nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/nix/default.nix
nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/nix/prehook.sh
Modified: nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/darwin/default.nix
==============================================================================
--- nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/nix/default.nix Sun Jan
15 22:31:44 2012 (r31574)
+++ nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/darwin/default.nix
Sun Jan 15 22:52:29 2012 (r31575)
@@ -1,7 +1,7 @@
{stdenv, pkgs}:
import ../generic {
- name = "stdenv-nix";
+ name = "stdenv-darwin";
preHook = ./prehook.sh;
initialPath = (import ../common-path.nix) {pkgs = pkgs;};
@@ -11,12 +11,8 @@
nativeTools = false;
nativeLibc = true;
inherit stdenv;
- binutils =
- if stdenv.isDarwin then
- import ../../build-support/native-darwin-cctools-wrapper {inherit
stdenv;}
- else
- pkgs.binutils;
- gcc = if stdenv.isDarwin then pkgs.gccApple.gcc else pkgs.gcc.gcc;
+ binutils = import ../../build-support/native-darwin-cctools-wrapper
{inherit stdenv;};
+ gcc = pkgs.gccApple.gcc;
coreutils = pkgs.coreutils;
shell = pkgs.bash + "/bin/sh";
};
Modified: nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/darwin/prehook.sh
==============================================================================
--- nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/nix/prehook.sh Sun Jan
15 22:31:44 2012 (r31574)
+++ nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/darwin/prehook.sh Sun Jan
15 22:52:29 2012 (r31575)
@@ -1,11 +1,9 @@
export NIX_ENFORCE_PURITY=1
export NIX_IGNORE_LD_THROUGH_GCC=1
-if test "$system" = "i686-darwin" -o "$system" = "powerpc-darwin" -o "$system"
= "x86_64-darwin"; then
- export NIX_DONT_SET_RPATH=1
- export NIX_NO_SELF_RPATH=1
- dontFixLibtool=1
- NIX_STRIP_DEBUG=0 # !!! do we still need this?
- stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
- xargsFlags=" "
-fi
+export NIX_DONT_SET_RPATH=1
+export NIX_NO_SELF_RPATH=1
+dontFixLibtool=1
+NIX_STRIP_DEBUG=0 # !!! do we still need this?
+stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
+xargsFlags=" "
Modified: nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/default.nix
==============================================================================
--- nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/default.nix Sun Jan
15 22:31:44 2012 (r31574)
+++ nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/default.nix Sun Jan
15 22:52:29 2012 (r31575)
@@ -39,6 +39,11 @@
pkgs = stdenvNativePkgs;
};
+ # Darwin standard environment.
+ stdenvDarwin = import ./darwin {
+ stdenv = stdenvNative;
+ pkgs = stdenvNativePkgs;
+ };
# Linux standard environment.
stdenvLinux = (import ./linux {inherit system allPackages
platform;}).stdenvLinux;
@@ -58,7 +63,7 @@
if stdenvType == "mips64-linux" then stdenvLinux else
if stdenvType == "powerpc-linux" then /* stdenvLinux */ stdenvNative else
if stdenvType == "i686-mingw" then stdenvMinGW else
- if stdenvType == "i686-darwin" then stdenvNix else
- if stdenvType == "x86_64-darwin" then stdenvNix else
+ if stdenvType == "i686-darwin" then stdenvDarwin else
+ if stdenvType == "x86_64-darwin" then stdenvDarwin else
stdenvNative;
}
Modified: nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/nix/default.nix
==============================================================================
--- nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/nix/default.nix Sun Jan
15 22:31:44 2012 (r31574)
+++ nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/nix/default.nix Sun Jan
15 22:52:29 2012 (r31575)
@@ -11,12 +11,8 @@
nativeTools = false;
nativeLibc = true;
inherit stdenv;
- binutils =
- if stdenv.isDarwin then
- import ../../build-support/native-darwin-cctools-wrapper {inherit
stdenv;}
- else
- pkgs.binutils;
- gcc = if stdenv.isDarwin then pkgs.gccApple.gcc else pkgs.gcc.gcc;
+ binutils = pkgs.binutils;
+ gcc = pkgs.gcc.gcc;
coreutils = pkgs.coreutils;
shell = pkgs.bash + "/bin/sh";
};
Modified: nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/nix/prehook.sh
==============================================================================
--- nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/nix/prehook.sh Sun Jan
15 22:31:44 2012 (r31574)
+++ nixpkgs/branches/darwin-without-xcode/pkgs/stdenv/nix/prehook.sh Sun Jan
15 22:52:29 2012 (r31575)
@@ -1,11 +1,2 @@
export NIX_ENFORCE_PURITY=1
export NIX_IGNORE_LD_THROUGH_GCC=1
-
-if test "$system" = "i686-darwin" -o "$system" = "powerpc-darwin" -o "$system"
= "x86_64-darwin"; then
- export NIX_DONT_SET_RPATH=1
- export NIX_NO_SELF_RPATH=1
- dontFixLibtool=1
- NIX_STRIP_DEBUG=0 # !!! do we still need this?
- stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
- xargsFlags=" "
-fi
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
