Author: ludo Date: Mon Apr 23 15:47:31 2012 New Revision: 33893 URL: https://nixos.org/websvn/nix/?rev=33893&sc=1
Log: Darwin: Add `mig', `lipo', etc. to `stdenvNative'. Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc. Deleted: nixpkgs/trunk/pkgs/os-specific/darwin/arch/builder.sh nixpkgs/trunk/pkgs/os-specific/darwin/arch/default.nix nixpkgs/trunk/pkgs/os-specific/darwin/install_name_tool/builder.sh nixpkgs/trunk/pkgs/os-specific/darwin/install_name_tool/default.nix nixpkgs/trunk/pkgs/os-specific/darwin/lipo/builder.sh nixpkgs/trunk/pkgs/os-specific/darwin/lipo/default.nix nixpkgs/trunk/pkgs/os-specific/darwin/sw_vers/builder.sh nixpkgs/trunk/pkgs/os-specific/darwin/sw_vers/default.nix Modified: nixpkgs/trunk/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh nixpkgs/trunk/pkgs/build-support/native-darwin-cctools-wrapper/default.nix nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.2.nix nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.3.nix nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix nixpkgs/trunk/pkgs/development/compilers/ghc/7.2.1.nix nixpkgs/trunk/pkgs/development/compilers/ghc/7.2.2.nix nixpkgs/trunk/pkgs/development/compilers/ghc/7.4.1.nix nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix nixpkgs/trunk/pkgs/development/compilers/llvm/clang.nix nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix nixpkgs/trunk/pkgs/development/interpreters/python/2.6/default.nix nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix nixpkgs/trunk/pkgs/development/interpreters/python/3.1/default.nix nixpkgs/trunk/pkgs/development/interpreters/python/3.2/default.nix nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix nixpkgs/trunk/pkgs/development/libraries/yajl/default.nix nixpkgs/trunk/pkgs/development/tools/analysis/valgrind/default.nix nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/264.nix nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix nixpkgs/trunk/pkgs/development/web/nodejs/default.nix nixpkgs/trunk/pkgs/servers/sql/mysql55/default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Modified: nixpkgs/trunk/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh ============================================================================== --- nixpkgs/trunk/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh Mon Apr 23 15:47:31 2012 (r33893) @@ -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" <<EOF +#!/bin/sh +export PATH="/usr/bin:/bin:\$PATH" +exec /usr/bin/mig "\$@" +EOF +chmod +x "$out/bin/mig" Modified: nixpkgs/trunk/pkgs/build-support/native-darwin-cctools-wrapper/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/build-support/native-darwin-cctools-wrapper/default.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/build-support/native-darwin-cctools-wrapper/default.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -2,5 +2,14 @@ stdenv.mkDerivation { name = "native-darwin-cctools-wrapper"; + + # Standard binaries normally found under /usr/bin (MIG is omitted here, and + # handled specially in ./builder.sh). + binaries = + [ "ar" "as" "c++filt" "gprof" "ld" "nm" "nmedit" "ranlib" + "size" "strings" "strip" "dsymutil" "libtool" "lipo" + "install_name_tool" "arch" "sw_vers" + ]; + builder = ./builder.sh; } Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.2.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.2.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.2.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}: +{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { version = "7.0.2"; @@ -9,8 +9,7 @@ sha256 = "f0551f1af2f008a8a14a888b70c0557e00dd04f9ae309ac91897306cd04a6668"; }; - buildInputs = [ghc perl gmp ncurses] ++ - (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []); + buildInputs = [ ghc perl gmp ncurses ]; buildMK = '' libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.3.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.3.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.3.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}: +{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { version = "7.0.3"; @@ -9,8 +9,7 @@ sha256 = "1nfc2c6bdcdfg3f3d9q5v109jrrwhz6by3qa4qi7k0xbip16jq8m"; }; - buildInputs = [ghc perl gmp ncurses] ++ - (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []); + buildInputs = [ ghc perl gmp ncurses ]; buildMK = '' libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}: +{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { version = "7.0.4"; @@ -9,8 +9,7 @@ sha256 = "1a9b78d9d66c9c21de6c0932e36bb87406a4856f1611bf83bd44539bdc6ed0ed"; }; - buildInputs = [ghc perl gmp ncurses] ++ - (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []); + buildInputs = [ ghc perl gmp ncurses ]; buildMK = '' libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.2.1.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/compilers/ghc/7.2.1.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.2.1.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}: +{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { version = "7.2.1"; @@ -9,8 +9,7 @@ sha256 = "099w2bvx07jq4b1k8f1hspri30wbk35dz6ilsivxr2xg661c2qjm"; }; - buildInputs = [ghc perl gmp ncurses] ++ - (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []); + buildInputs = [ ghc perl gmp ncurses ]; buildMK = '' libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.2.2.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/compilers/ghc/7.2.2.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.2.2.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}: +{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { version = "7.2.2"; @@ -9,8 +9,7 @@ sha256 = "0g87d3z9275dniaqzkf56qfgzp1msd89nqqhhm2gkc6iga072spz"; }; - buildInputs = [ghc perl gmp ncurses] ++ - (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []); + buildInputs = [ ghc perl gmp ncurses ]; buildMK = '' libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.4.1.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/compilers/ghc/7.4.1.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.4.1.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}: +{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { version = "7.4.1"; @@ -9,8 +9,7 @@ sha256 = "0ycscsagyy9n796a59q6761s6ar50d8inibvnrcp96siksj0j73j"; }; - buildInputs = [ghc perl gmp ncurses] ++ - (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []); + buildInputs = [ ghc perl gmp ncurses ]; buildMK = '' libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}: +{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { version = "7.5.20120419"; @@ -10,8 +10,7 @@ sha256 = "0fwq2s3syk3l4xx0m8x6h67snldlf3qk9bjjkvx46sgr0q3xjd05"; }; - buildInputs = [ghc perl gmp ncurses] ++ - (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []); + buildInputs = [ ghc perl gmp ncurses ]; buildMK = '' libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" Modified: nixpkgs/trunk/pkgs/development/compilers/llvm/clang.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/compilers/llvm/clang.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/compilers/llvm/clang.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, perl, groff, llvm, cmake, darwinInstallNameToolUtility }: +{ stdenv, fetchurl, perl, groff, llvm, cmake }: let version = "3.0"; in stdenv.mkDerivation { name = "clang-${version}"; - buildInputs = [ perl llvm groff cmake ] ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility; + buildInputs = [ perl llvm groff cmake ]; patches = stdenv.lib.optionals (stdenv.gcc.libc != null) [ ./clang-include-paths.patch ./clang-ld-flags.patch ]; Modified: nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, groff, darwinSwVersUtility, darwinInstallNameToolUtility, cmake }: +{ stdenv, fetchurl, perl, groff, cmake }: let version = "3.0"; in @@ -10,8 +10,7 @@ sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji"; }; - buildInputs = [ perl groff cmake ] ++ - stdenv.lib.optionals stdenv.isDarwin [ darwinSwVersUtility darwinInstallNameToolUtility ]; + buildInputs = [ perl groff cmake ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; Modified: nixpkgs/trunk/pkgs/development/interpreters/python/2.6/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/interpreters/python/2.6/default.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/interpreters/python/2.6/default.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -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; @@ -33,8 +30,7 @@ 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 Modified: nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -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 @@ 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 = '' Modified: nixpkgs/trunk/pkgs/development/interpreters/python/3.1/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/interpreters/python/3.1/default.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/interpreters/python/3.1/default.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -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 @@ 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 { Modified: nixpkgs/trunk/pkgs/development/interpreters/python/3.2/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/interpreters/python/3.2/default.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/interpreters/python/3.2/default.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -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 @@ 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 { Modified: nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -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.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 ]; Modified: nixpkgs/trunk/pkgs/development/libraries/yajl/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/libraries/yajl/default.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/libraries/yajl/default.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, ruby, darwinInstallNameToolUtility}: +{ stdenv, fetchurl, cmake, ruby }: stdenv.mkDerivation { name = "yajl-2.0.1"; @@ -9,8 +9,7 @@ sha256 = "08a7bgmdpvi6w9f9bxx5f42njwmwzdf6jz3w6ila7jgbl5mhknf2"; }; - buildInputs = [ cmake ruby ] - ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility; + buildInputs = [ cmake ruby ]; meta = { description = "Yet Another JSON Library"; Modified: nixpkgs/trunk/pkgs/development/tools/analysis/valgrind/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/tools/analysis/valgrind/default.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/tools/analysis/valgrind/default.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -59,21 +59,5 @@ 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" <<EOF -#!/bin/sh -export PATH="/usr/bin:/bin:\$PATH" -exec /usr/bin/mig "\$@" -EOF - chmod +x "$TMPDIR/impure-deps/bin/mig" - - export PATH="$TMPDIR/impure-deps/bin:$PATH" - ''; } else {})) Modified: nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/264.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/264.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/264.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -1,6 +1,6 @@ { fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive , useNcurses ? false, ncurses, useQt4 ? false, qt4, xmlrpc_c -, darwinInstallNameToolUtility }: +}: with stdenv.lib; @@ -27,7 +27,6 @@ optional (stdenv ? glibc) ./search-path-264.patch; buildInputs = [ curl expat zlib bzip2 libarchive xmlrpc_c ] - ++ optional stdenv.isDarwin darwinInstallNameToolUtility ++ optional useNcurses ncurses ++ optional useQt4 qt4; Modified: nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -1,6 +1,6 @@ { fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive , useNcurses ? false, ncurses, useQt4 ? false, qt4 -, darwinInstallNameToolUtility }: +}: with stdenv.lib; @@ -27,7 +27,6 @@ optional (stdenv ? glibc) ./search-path.patch; buildInputs = [ curl expat zlib bzip2 libarchive ] - ++ optional stdenv.isDarwin darwinInstallNameToolUtility ++ optional useNcurses ncurses ++ optional useQt4 qt4; Modified: nixpkgs/trunk/pkgs/development/web/nodejs/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/web/nodejs/default.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/development/web/nodejs/default.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8, darwinInstallNameToolUtility }: +{ stdenv, fetchurl, openssl, python, zlib, v8 }: stdenv.mkDerivation rec { version = "0.6.14"; @@ -27,7 +27,7 @@ install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node ''; - buildInputs = [ python openssl v8 zlib ] ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility; + buildInputs = [ python openssl v8 zlib ]; meta = with stdenv.lib; { description = "Event-driven I/O framework for the V8 JavaScript engine"; Modified: nixpkgs/trunk/pkgs/servers/sql/mysql55/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/servers/sql/mysql55/default.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/servers/sql/mysql55/default.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, darwinInstallNameToolUtility, perl}: +{ stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl }: # Note: zlib is not required; MySQL can use an internal zlib. @@ -10,8 +10,8 @@ sha256 = "0sklcz6miff7nb6bi1pqncgjv819255y7if6jxcqgiqs50z319i0"; }; - buildInputs = [ cmake bison ncurses openssl readline zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwinInstallNameToolUtility perl ]; - + buildInputs = [ cmake bison ncurses openssl readline zlib ]; + cmakeFlags = "-DWITH_SSL=yes -DWITH_READLINE=yes -DWITH_EMBEDDED_SERVER=yes -DWITH_ZLIB=yes -DINSTALL_SCRIPTDIR=bin -DHAVE_IPV6=yes"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Apr 23 15:47:21 2012 (r33892) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Apr 23 15:47:31 2012 (r33893) @@ -2755,15 +2755,9 @@ python27 = callPackage ../development/interpreters/python/2.7 { }; - python31 = callPackage ../development/interpreters/python/3.1 { - arch = if stdenv.isDarwin then pkgs.darwinArchUtility else null; - sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null; - }; + python31 = callPackage ../development/interpreters/python/3.1 { }; - python32 = callPackage ../development/interpreters/python/3.2 { - arch = if stdenv.isDarwin then pkgs.darwinArchUtility else null; - sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null; - }; + python32 = callPackage ../development/interpreters/python/3.2 { }; pythonFull = python27Full; @@ -4387,9 +4381,7 @@ system == "x86_64-darwin" || system == "i686-darwin"; - mesa = callPackage ../development/libraries/mesa { - lipo = if stdenv.isDarwin then darwinLipoUtility else null; - }; + mesa = callPackage ../development/libraries/mesa { }; metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; @@ -5401,14 +5393,6 @@ cramfsswap = callPackage ../os-specific/linux/cramfsswap { }; - darwinArchUtility = callPackage ../os-specific/darwin/arch { }; - - darwinSwVersUtility = callPackage ../os-specific/darwin/sw_vers { }; - - darwinLipoUtility = callPackage ../os-specific/darwin/lipo { }; - - darwinInstallNameToolUtility = callPackage ../os-specific/darwin/install_name_tool { }; - devicemapper = lvm2; dmidecode = callPackage ../os-specific/linux/dmidecode { }; _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits