From 04600bbec1d0902b6aeec4528718f6fc7c3dc040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 23 Apr 2012 15:47:31 +0000 Subject: [PATCH] Darwin: Add `mig', `lipo', etc. to `stdenvNative'. Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc. svn path=/nixpkgs/trunk/; revision=33893 --- .../native-darwin-cctools-wrapper/builder.sh | 14 ++++++++++-- .../native-darwin-cctools-wrapper/default.nix | 9 ++++++++ pkgs/development/compilers/ghc/7.0.2.nix | 5 ++--- pkgs/development/compilers/ghc/7.0.3.nix | 5 ++--- pkgs/development/compilers/ghc/7.0.4.nix | 5 ++--- pkgs/development/compilers/ghc/7.2.1.nix | 5 ++--- pkgs/development/compilers/ghc/7.2.2.nix | 5 ++--- pkgs/development/compilers/ghc/7.4.1.nix | 5 ++--- pkgs/development/compilers/ghc/head.nix | 5 ++--- pkgs/development/compilers/llvm/clang.nix | 4 ++-- pkgs/development/compilers/llvm/default.nix | 5 ++--- .../interpreters/python/2.6/default.nix | 6 +---- .../interpreters/python/2.7/default.nix | 6 +---- .../interpreters/python/3.1/default.nix | 5 +---- .../interpreters/python/3.2/default.nix | 5 +---- pkgs/development/libraries/mesa/default.nix | 4 ++-- pkgs/development/libraries/yajl/default.nix | 5 ++--- .../tools/analysis/valgrind/default.nix | 16 -------------- .../tools/build-managers/cmake/264.nix | 3 +-- .../tools/build-managers/cmake/default.nix | 3 +-- pkgs/development/web/nodejs/default.nix | 4 ++-- pkgs/os-specific/darwin/arch/builder.sh | 3 --- pkgs/os-specific/darwin/arch/default.nix | 8 ------- .../darwin/install_name_tool/builder.sh | 3 --- .../darwin/install_name_tool/default.nix | 8 ------- pkgs/os-specific/darwin/lipo/builder.sh | 3 --- pkgs/os-specific/darwin/lipo/default.nix | 8 ------- pkgs/os-specific/darwin/sw_vers/builder.sh | 3 --- pkgs/os-specific/darwin/sw_vers/default.nix | 8 ------- pkgs/servers/sql/mysql55/default.nix | 6 ++--- pkgs/top-level/all-packages.nix | 22 +++---------------- 31 files changed, 57 insertions(+), 139 deletions(-) delete mode 100755 pkgs/os-specific/darwin/arch/builder.sh delete mode 100644 pkgs/os-specific/darwin/arch/default.nix delete mode 100755 pkgs/os-specific/darwin/install_name_tool/builder.sh delete mode 100644 pkgs/os-specific/darwin/install_name_tool/default.nix delete mode 100755 pkgs/os-specific/darwin/lipo/builder.sh delete mode 100644 pkgs/os-specific/darwin/lipo/default.nix delete mode 100755 pkgs/os-specific/darwin/sw_vers/builder.sh delete mode 100644 pkgs/os-specific/darwin/sw_vers/default.nix diff --git a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh index 2e2e125c6495..f412ee7caf09 100644 --- a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh +++ b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh @@ -1,6 +1,16 @@ source $stdenv/setup mkdir -p $out/bin -for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip dsymutil libtool; do - ln -s /usr/bin/$i $out/bin/ +for i in $binaries +do + ln -s "/usr/bin/$i" "$out/bin/" done + +# MIG assumes the standard Darwin core utilities (e.g., `rm -d'), so +# let it see the impure directories. +cat > "$out/bin/mig" < zlib != null; -assert stdenv.isDarwin -> darwinArchUtility != null; -assert stdenv.isDarwin -> darwinSwVersUtility != null; with stdenv.lib; @@ -33,8 +30,7 @@ let buildInputs = optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ [ bzip2 ] - ++ optional zlibSupport zlib - ++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ]; + ++ optional zlibSupport zlib; # Build the basic Python interpreter without modules that have diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 439cc82bf3e9..e4d3d057570f 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 , sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm -, darwinArchUtility ? null, darwinSwVersUtility ? null }: assert zlibSupport -> zlib != null; -assert stdenv.isDarwin -> darwinArchUtility != null; -assert stdenv.isDarwin -> darwinSwVersUtility != null; with stdenv.lib; @@ -39,8 +36,7 @@ let buildInputs = optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ [ bzip2 openssl ] - ++ optional zlibSupport zlib - ++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ]; + ++ optional zlibSupport zlib; ensurePurity = '' diff --git a/pkgs/development/interpreters/python/3.1/default.nix b/pkgs/development/interpreters/python/3.1/default.nix index 892af52a9197..92b090bb41ee 100644 --- a/pkgs/development/interpreters/python/3.1/default.nix +++ b/pkgs/development/interpreters/python/3.1/default.nix @@ -9,11 +9,8 @@ , openssl , tcl, tk , libX11, xproto -, arch ? null, sw_vers ? null }: -assert stdenv.isDarwin -> arch != null; -assert stdenv.isDarwin -> sw_vers != null; assert readline != null -> ncurses != null; with stdenv.lib; @@ -23,7 +20,7 @@ let version = "${majorVersion}.3"; buildInputs = filter (p: p != null) [ - zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto arch sw_vers + zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto ]; in stdenv.mkDerivation { diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index 1ab115f04696..6e496e0ea1ad 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -9,11 +9,8 @@ , openssl , tcl, tk , libX11, xproto -, arch ? null, sw_vers ? null }: -assert stdenv.isDarwin -> arch != null; -assert stdenv.isDarwin -> sw_vers != null; assert readline != null -> ncurses != null; with stdenv.lib; @@ -23,7 +20,7 @@ let version = "${majorVersion}"; buildInputs = filter (p: p != null) [ - zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto arch sw_vers + zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto ]; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 55701cf18c96..219dc161761b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend , libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext , libXt, udev, enableTextureFloats ? false -, python, libxml2Python, lipo ? null }: +, python, libxml2Python }: if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then throw "unsupported platform for Mesa" @@ -32,7 +32,7 @@ stdenv.mkDerivation { + stdenv.lib.optionalString enableTextureFloats " --enable-texture-float"; buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto - libxml2Python libX11 libXext libxcb lipo libXt udev ]; + libxml2Python libX11 libXext libxcb libXt udev ]; buildNativeInputs = [ pkgconfig python makedepend file flex bison ]; diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index 221344b91251..e58c6dcba120 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, ruby, darwinInstallNameToolUtility}: +{ stdenv, fetchurl, cmake, ruby }: stdenv.mkDerivation { name = "yajl-2.0.1"; @@ -9,8 +9,7 @@ stdenv.mkDerivation { sha256 = "08a7bgmdpvi6w9f9bxx5f42njwmwzdf6jz3w6ila7jgbl5mhknf2"; }; - buildInputs = [ cmake ruby ] - ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility; + buildInputs = [ cmake ruby ]; meta = { description = "Yet Another JSON Library"; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index d0c5e624d394..a625de6ffdce 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -59,21 +59,5 @@ stdenv.mkDerivation (rec { sed -i coregrind/link_tool_exe_darwin.in \ -e 's/^my \$archstr = .*/my $archstr = "x86_64";/g' ''; - - preConfigure = - # Shamelessly drag in MIG. - '' mkdir -p "$TMPDIR/impure-deps/bin" - - # MIG assumes the standard Darwin core utilities (e.g., `rm -d'), so - # let it see the impure directories. - cat > "$TMPDIR/impure-deps/bin/mig" <