mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-31 14:41:27 +00:00
Darwin: Add mig',
lipo', etc. to `stdenvNative'.
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc. svn path=/nixpkgs/trunk/; revision=33893
This commit is contained in:
parent
0a9d954bc6
commit
04600bbec1
@ -1,6 +1,16 @@
|
|||||||
source $stdenv/setup
|
source $stdenv/setup
|
||||||
|
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip dsymutil libtool; do
|
for i in $binaries
|
||||||
ln -s /usr/bin/$i $out/bin/
|
do
|
||||||
|
ln -s "/usr/bin/$i" "$out/bin/"
|
||||||
done
|
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"
|
||||||
|
@ -2,5 +2,14 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "native-darwin-cctools-wrapper";
|
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;
|
builder = ./builder.sh;
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
|
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "7.0.2";
|
version = "7.0.2";
|
||||||
@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "f0551f1af2f008a8a14a888b70c0557e00dd04f9ae309ac91897306cd04a6668";
|
sha256 = "f0551f1af2f008a8a14a888b70c0557e00dd04f9ae309ac91897306cd04a6668";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ghc perl gmp ncurses] ++
|
buildInputs = [ ghc perl gmp ncurses ];
|
||||||
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
|
|
||||||
|
|
||||||
buildMK = ''
|
buildMK = ''
|
||||||
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
|
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "7.0.3";
|
version = "7.0.3";
|
||||||
@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1nfc2c6bdcdfg3f3d9q5v109jrrwhz6by3qa4qi7k0xbip16jq8m";
|
sha256 = "1nfc2c6bdcdfg3f3d9q5v109jrrwhz6by3qa4qi7k0xbip16jq8m";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ghc perl gmp ncurses] ++
|
buildInputs = [ ghc perl gmp ncurses ];
|
||||||
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
|
|
||||||
|
|
||||||
buildMK = ''
|
buildMK = ''
|
||||||
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
|
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "7.0.4";
|
version = "7.0.4";
|
||||||
@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1a9b78d9d66c9c21de6c0932e36bb87406a4856f1611bf83bd44539bdc6ed0ed";
|
sha256 = "1a9b78d9d66c9c21de6c0932e36bb87406a4856f1611bf83bd44539bdc6ed0ed";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ghc perl gmp ncurses] ++
|
buildInputs = [ ghc perl gmp ncurses ];
|
||||||
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
|
|
||||||
|
|
||||||
buildMK = ''
|
buildMK = ''
|
||||||
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
|
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "7.2.1";
|
version = "7.2.1";
|
||||||
@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "099w2bvx07jq4b1k8f1hspri30wbk35dz6ilsivxr2xg661c2qjm";
|
sha256 = "099w2bvx07jq4b1k8f1hspri30wbk35dz6ilsivxr2xg661c2qjm";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ghc perl gmp ncurses] ++
|
buildInputs = [ ghc perl gmp ncurses ];
|
||||||
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
|
|
||||||
|
|
||||||
buildMK = ''
|
buildMK = ''
|
||||||
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
|
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "7.2.2";
|
version = "7.2.2";
|
||||||
@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0g87d3z9275dniaqzkf56qfgzp1msd89nqqhhm2gkc6iga072spz";
|
sha256 = "0g87d3z9275dniaqzkf56qfgzp1msd89nqqhhm2gkc6iga072spz";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ghc perl gmp ncurses] ++
|
buildInputs = [ ghc perl gmp ncurses ];
|
||||||
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
|
|
||||||
|
|
||||||
buildMK = ''
|
buildMK = ''
|
||||||
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
|
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "7.4.1";
|
version = "7.4.1";
|
||||||
@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0ycscsagyy9n796a59q6761s6ar50d8inibvnrcp96siksj0j73j";
|
sha256 = "0ycscsagyy9n796a59q6761s6ar50d8inibvnrcp96siksj0j73j";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ghc perl gmp ncurses] ++
|
buildInputs = [ ghc perl gmp ncurses ];
|
||||||
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
|
|
||||||
|
|
||||||
buildMK = ''
|
buildMK = ''
|
||||||
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
|
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "7.5.20120419";
|
version = "7.5.20120419";
|
||||||
@ -10,8 +10,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0fwq2s3syk3l4xx0m8x6h67snldlf3qk9bjjkvx46sgr0q3xjd05";
|
sha256 = "0fwq2s3syk3l4xx0m8x6h67snldlf3qk9bjjkvx46sgr0q3xjd05";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ghc perl gmp ncurses] ++
|
buildInputs = [ ghc perl gmp ncurses ];
|
||||||
(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
|
|
||||||
|
|
||||||
buildMK = ''
|
buildMK = ''
|
||||||
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
{ stdenv, fetchurl, perl, groff, llvm, cmake, darwinInstallNameToolUtility }:
|
{ stdenv, fetchurl, perl, groff, llvm, cmake }:
|
||||||
|
|
||||||
let version = "3.0"; in
|
let version = "3.0"; in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "clang-${version}";
|
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)
|
patches = stdenv.lib.optionals (stdenv.gcc.libc != null)
|
||||||
[ ./clang-include-paths.patch ./clang-ld-flags.patch ];
|
[ ./clang-include-paths.patch ./clang-ld-flags.patch ];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, perl, groff, darwinSwVersUtility, darwinInstallNameToolUtility, cmake }:
|
{ stdenv, fetchurl, perl, groff, cmake }:
|
||||||
|
|
||||||
let version = "3.0"; in
|
let version = "3.0"; in
|
||||||
|
|
||||||
@ -10,8 +10,7 @@ stdenv.mkDerivation {
|
|||||||
sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji";
|
sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ perl groff cmake ] ++
|
buildInputs = [ perl groff cmake ];
|
||||||
stdenv.lib.optionals stdenv.isDarwin [ darwinSwVersUtility darwinInstallNameToolUtility ];
|
|
||||||
|
|
||||||
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
|
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
|
||||||
|
|
||||||
|
@ -1,11 +1,8 @@
|
|||||||
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
|
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
|
||||||
, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm
|
, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm
|
||||||
, darwinArchUtility ? null, darwinSwVersUtility ? null
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert zlibSupport -> zlib != null;
|
assert zlibSupport -> zlib != null;
|
||||||
assert stdenv.isDarwin -> darwinArchUtility != null;
|
|
||||||
assert stdenv.isDarwin -> darwinSwVersUtility != null;
|
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
@ -33,8 +30,7 @@ let
|
|||||||
buildInputs =
|
buildInputs =
|
||||||
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
|
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
|
||||||
[ bzip2 ]
|
[ bzip2 ]
|
||||||
++ optional zlibSupport zlib
|
++ optional zlibSupport zlib;
|
||||||
++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ];
|
|
||||||
|
|
||||||
|
|
||||||
# Build the basic Python interpreter without modules that have
|
# Build the basic Python interpreter without modules that have
|
||||||
|
@ -1,11 +1,8 @@
|
|||||||
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
|
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
|
||||||
, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm
|
, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm
|
||||||
, darwinArchUtility ? null, darwinSwVersUtility ? null
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert zlibSupport -> zlib != null;
|
assert zlibSupport -> zlib != null;
|
||||||
assert stdenv.isDarwin -> darwinArchUtility != null;
|
|
||||||
assert stdenv.isDarwin -> darwinSwVersUtility != null;
|
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
@ -39,8 +36,7 @@ let
|
|||||||
buildInputs =
|
buildInputs =
|
||||||
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
|
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
|
||||||
[ bzip2 openssl ]
|
[ bzip2 openssl ]
|
||||||
++ optional zlibSupport zlib
|
++ optional zlibSupport zlib;
|
||||||
++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ];
|
|
||||||
|
|
||||||
ensurePurity =
|
ensurePurity =
|
||||||
''
|
''
|
||||||
|
@ -9,11 +9,8 @@
|
|||||||
, openssl
|
, openssl
|
||||||
, tcl, tk
|
, tcl, tk
|
||||||
, libX11, xproto
|
, libX11, xproto
|
||||||
, arch ? null, sw_vers ? null
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert stdenv.isDarwin -> arch != null;
|
|
||||||
assert stdenv.isDarwin -> sw_vers != null;
|
|
||||||
assert readline != null -> ncurses != null;
|
assert readline != null -> ncurses != null;
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
@ -23,7 +20,7 @@ let
|
|||||||
version = "${majorVersion}.3";
|
version = "${majorVersion}.3";
|
||||||
|
|
||||||
buildInputs = filter (p: p != null) [
|
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
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
@ -9,11 +9,8 @@
|
|||||||
, openssl
|
, openssl
|
||||||
, tcl, tk
|
, tcl, tk
|
||||||
, libX11, xproto
|
, libX11, xproto
|
||||||
, arch ? null, sw_vers ? null
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert stdenv.isDarwin -> arch != null;
|
|
||||||
assert stdenv.isDarwin -> sw_vers != null;
|
|
||||||
assert readline != null -> ncurses != null;
|
assert readline != null -> ncurses != null;
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
@ -23,7 +20,7 @@ let
|
|||||||
version = "${majorVersion}";
|
version = "${majorVersion}";
|
||||||
|
|
||||||
buildInputs = filter (p: p != null) [
|
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
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{ stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend
|
{ stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend
|
||||||
, libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext
|
, libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext
|
||||||
, libXt, udev, enableTextureFloats ? false
|
, libXt, udev, enableTextureFloats ? false
|
||||||
, python, libxml2Python, lipo ? null }:
|
, python, libxml2Python }:
|
||||||
|
|
||||||
if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
|
if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
|
||||||
throw "unsupported platform for Mesa"
|
throw "unsupported platform for Mesa"
|
||||||
@ -32,7 +32,7 @@ stdenv.mkDerivation {
|
|||||||
+ stdenv.lib.optionalString enableTextureFloats " --enable-texture-float";
|
+ stdenv.lib.optionalString enableTextureFloats " --enable-texture-float";
|
||||||
|
|
||||||
buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto
|
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 ];
|
buildNativeInputs = [ pkgconfig python makedepend file flex bison ];
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{stdenv, fetchurl, cmake, ruby, darwinInstallNameToolUtility}:
|
{ stdenv, fetchurl, cmake, ruby }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "yajl-2.0.1";
|
name = "yajl-2.0.1";
|
||||||
@ -9,8 +9,7 @@ stdenv.mkDerivation {
|
|||||||
sha256 = "08a7bgmdpvi6w9f9bxx5f42njwmwzdf6jz3w6ila7jgbl5mhknf2";
|
sha256 = "08a7bgmdpvi6w9f9bxx5f42njwmwzdf6jz3w6ila7jgbl5mhknf2";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ cmake ruby ]
|
buildInputs = [ cmake ruby ];
|
||||||
++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility;
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Yet Another JSON Library";
|
description = "Yet Another JSON Library";
|
||||||
|
@ -59,21 +59,5 @@ stdenv.mkDerivation (rec {
|
|||||||
sed -i coregrind/link_tool_exe_darwin.in \
|
sed -i coregrind/link_tool_exe_darwin.in \
|
||||||
-e 's/^my \$archstr = .*/my $archstr = "x86_64";/g'
|
-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 {}))
|
else {}))
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
|
{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
|
||||||
, useNcurses ? false, ncurses, useQt4 ? false, qt4, xmlrpc_c
|
, useNcurses ? false, ncurses, useQt4 ? false, qt4, xmlrpc_c
|
||||||
, darwinInstallNameToolUtility }:
|
}:
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
|
|||||||
optional (stdenv ? glibc) ./search-path-264.patch;
|
optional (stdenv ? glibc) ./search-path-264.patch;
|
||||||
|
|
||||||
buildInputs = [ curl expat zlib bzip2 libarchive xmlrpc_c ]
|
buildInputs = [ curl expat zlib bzip2 libarchive xmlrpc_c ]
|
||||||
++ optional stdenv.isDarwin darwinInstallNameToolUtility
|
|
||||||
++ optional useNcurses ncurses
|
++ optional useNcurses ncurses
|
||||||
++ optional useQt4 qt4;
|
++ optional useQt4 qt4;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
|
{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
|
||||||
, useNcurses ? false, ncurses, useQt4 ? false, qt4
|
, useNcurses ? false, ncurses, useQt4 ? false, qt4
|
||||||
, darwinInstallNameToolUtility }:
|
}:
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
|
|||||||
optional (stdenv ? glibc) ./search-path.patch;
|
optional (stdenv ? glibc) ./search-path.patch;
|
||||||
|
|
||||||
buildInputs = [ curl expat zlib bzip2 libarchive ]
|
buildInputs = [ curl expat zlib bzip2 libarchive ]
|
||||||
++ optional stdenv.isDarwin darwinInstallNameToolUtility
|
|
||||||
++ optional useNcurses ncurses
|
++ optional useNcurses ncurses
|
||||||
++ optional useQt4 qt4;
|
++ optional useQt4 qt4;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, openssl, python, zlib, v8, darwinInstallNameToolUtility }:
|
{ stdenv, fetchurl, openssl, python, zlib, v8 }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "0.6.14";
|
version = "0.6.14";
|
||||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||||||
install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node
|
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; {
|
meta = with stdenv.lib; {
|
||||||
description = "Event-driven I/O framework for the V8 JavaScript engine";
|
description = "Event-driven I/O framework for the V8 JavaScript engine";
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
source $stdenv/setup
|
|
||||||
mkdir -p "$out/bin"
|
|
||||||
ln -s /usr/bin/arch "$out/bin/"
|
|
@ -1,8 +0,0 @@
|
|||||||
{stdenv}:
|
|
||||||
|
|
||||||
assert stdenv.isDarwin;
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "darwin-arch-utility";
|
|
||||||
builder = ./builder.sh;
|
|
||||||
}
|
|
@ -1,3 +0,0 @@
|
|||||||
source $stdenv/setup
|
|
||||||
mkdir -p "$out/bin"
|
|
||||||
ln -s /usr/bin/install_name_tool "$out/bin/"
|
|
@ -1,8 +0,0 @@
|
|||||||
{stdenv}:
|
|
||||||
|
|
||||||
assert stdenv.isDarwin;
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "darwin-install_name_tool-utility";
|
|
||||||
builder = ./builder.sh;
|
|
||||||
}
|
|
@ -1,3 +0,0 @@
|
|||||||
source $stdenv/setup
|
|
||||||
mkdir -p "$out/bin"
|
|
||||||
ln -s /usr/bin/lipo "$out/bin/"
|
|
@ -1,8 +0,0 @@
|
|||||||
{stdenv}:
|
|
||||||
|
|
||||||
assert stdenv.isDarwin;
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "darwin-lipo-utility";
|
|
||||||
builder = ./builder.sh;
|
|
||||||
}
|
|
@ -1,3 +0,0 @@
|
|||||||
source $stdenv/setup
|
|
||||||
mkdir -p "$out/bin"
|
|
||||||
ln -s /usr/bin/sw_vers "$out/bin/"
|
|
@ -1,8 +0,0 @@
|
|||||||
{stdenv}:
|
|
||||||
|
|
||||||
assert stdenv.isDarwin;
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "darwin-sw-vers-utility";
|
|
||||||
builder = ./builder.sh;
|
|
||||||
}
|
|
@ -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.
|
# Note: zlib is not required; MySQL can use an internal zlib.
|
||||||
|
|
||||||
@ -10,8 +10,8 @@ stdenv.mkDerivation {
|
|||||||
sha256 = "0sklcz6miff7nb6bi1pqncgjv819255y7if6jxcqgiqs50z319i0";
|
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";
|
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";
|
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
|
||||||
|
@ -2755,15 +2755,9 @@ let
|
|||||||
|
|
||||||
python27 = callPackage ../development/interpreters/python/2.7 { };
|
python27 = callPackage ../development/interpreters/python/2.7 { };
|
||||||
|
|
||||||
python31 = callPackage ../development/interpreters/python/3.1 {
|
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;
|
|
||||||
};
|
|
||||||
|
|
||||||
python32 = callPackage ../development/interpreters/python/3.2 {
|
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;
|
|
||||||
};
|
|
||||||
|
|
||||||
pythonFull = python27Full;
|
pythonFull = python27Full;
|
||||||
|
|
||||||
@ -4387,9 +4381,7 @@ let
|
|||||||
system == "x86_64-darwin" ||
|
system == "x86_64-darwin" ||
|
||||||
system == "i686-darwin";
|
system == "i686-darwin";
|
||||||
|
|
||||||
mesa = callPackage ../development/libraries/mesa {
|
mesa = callPackage ../development/libraries/mesa { };
|
||||||
lipo = if stdenv.isDarwin then darwinLipoUtility else null;
|
|
||||||
};
|
|
||||||
|
|
||||||
metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {
|
metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {
|
||||||
sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; };
|
sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; };
|
||||||
@ -5401,14 +5393,6 @@ let
|
|||||||
|
|
||||||
cramfsswap = callPackage ../os-specific/linux/cramfsswap { };
|
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;
|
devicemapper = lvm2;
|
||||||
|
|
||||||
dmidecode = callPackage ../os-specific/linux/dmidecode { };
|
dmidecode = callPackage ../os-specific/linux/dmidecode { };
|
||||||
|
Loading…
Reference in New Issue
Block a user