diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-13 18:24:55 +0000 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-13 18:25:52 +0000 |
| commit | 6313a5698a881b99e5aed238b38d05776126623e (patch) | |
| tree | a0bb229c07820ee52d7ee90899dbea97a13d0640 /pkgs/stdenv/darwin | |
| parent | 27e5397282c4706d9e4b5229ad1a6d1282073c00 (diff) | |
| download | nixlib-6313a5698a881b99e5aed238b38d05776126623e.tar nixlib-6313a5698a881b99e5aed238b38d05776126623e.tar.gz nixlib-6313a5698a881b99e5aed238b38d05776126623e.tar.bz2 nixlib-6313a5698a881b99e5aed238b38d05776126623e.tar.lz nixlib-6313a5698a881b99e5aed238b38d05776126623e.tar.xz nixlib-6313a5698a881b99e5aed238b38d05776126623e.tar.zst nixlib-6313a5698a881b99e5aed238b38d05776126623e.zip | |
Replace references to all-packages.nix, by references to the top-level of nixpkgs repository.
Diffstat (limited to 'pkgs/stdenv/darwin')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 0af7071e2186..85c406d3703d 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1,5 +1,5 @@ { system ? builtins.currentSystem -, allPackages ? import ../../top-level/all-packages.nix +, allPackages ? import ../../.. , platform ? null , config ? {} @@ -22,7 +22,7 @@ let (import "${./standard-sandbox.sb}") ''; in rec { - allPackages = import ../../top-level/all-packages.nix; + allPackages = import ../../..; commonPreHook = '' export NIX_ENFORCE_PURITY=1 diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index d9d501ca0f51..b0025351b049 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -1,6 +1,6 @@ { system ? builtins.currentSystem }: -with import ../../top-level/all-packages.nix { inherit system; }; +with import ../../.. { inherit system; }; rec { # We want coreutils without ACL support. @@ -291,7 +291,7 @@ rec { # The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it test-pkgs = let stdenv = import ./. { inherit system bootstrapFiles; }; - in import ../../top-level/all-packages.nix { + in import ../../.. { inherit system; bootStdenv = stdenv.stdenvDarwin; }; |