public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re-fix evaluation of libSystemClosure

Browse Source
This commit is contained in:
Jude Taylor
2015-10-15 17:19:10 -07:00
parent 9685b08db7
commit c70ec3ec63
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/pure-darwin/default.nix
+9 -8
View File
@@ -6,8 +6,7 @@
let let
# libSystem and its transitive dependencies. Get used to this; it's a recurring theme in darwin land # libSystem and its transitive dependencies. Get used to this; it's a recurring theme in darwin land
libSystemClosure = if system == "x86_64-darwin" libSystemClosure = [
then [
"/usr/lib/libSystem.dylib" "/usr/lib/libSystem.dylib"
"/usr/lib/libSystem.B.dylib" "/usr/lib/libSystem.B.dylib"
"/usr/lib/libobjc.A.dylib" "/usr/lib/libobjc.A.dylib"
@@ -17,16 +16,18 @@ let
"/usr/lib/libc++.1.dylib" "/usr/lib/libc++.1.dylib"
"/usr/lib/libDiagnosticMessagesClient.dylib" "/usr/lib/libDiagnosticMessagesClient.dylib"
"/usr/lib/system" "/usr/lib/system"
] ];
else [];
fetch = { file, sha256 }: derivation ((import <nix/fetchurl.nix> { fetch = { file, sha256 }: let drv = import <nix/fetchurl.nix> {
url = "https://dl.dropboxusercontent.com/u/2857322/${file}"; url = "https://dl.dropboxusercontent.com/u/2857322/${file}";
inherit sha256; inherit sha256;
executable = true; executable = true;
}).drvAttrs // { }; in
__impureHostDeps = libSystemClosure; if drv.drvAttrs.system == "x86_64-darwin"
}); then derivation (drv.drvAttrs // {
__impureHostDeps = libSystemClosure;
})
else drv;
bootstrapFiles = { bootstrapFiles = {
sh = fetch { file = "sh"; sha256 = "1qakpg37vl61jnkplz13m3g1csqr85cg8ybp6jwiv6apmg26isnm"; }; sh = fetch { file = "sh"; sha256 = "1qakpg37vl61jnkplz13m3g1csqr85cg8ybp6jwiv6apmg26isnm"; };