diff options
author | Robin Gloster <mail@glob.in> | 2016-03-15 01:44:24 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-03-15 01:44:24 +0000 |
commit | 3f45f0948d6fe158bed063adb66850ded0ba4861 (patch) | |
tree | ac717689d391d3f5333132fc34e4b2aed829414c /pkgs/stdenv/freebsd/default.nix | |
parent | a9b942c0617b1cd5f0732d05eadad0114a178f37 (diff) | |
parent | d227d9a70e41d65e4e6f4ac75a9d243c5a19fa85 (diff) |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/stdenv/freebsd/default.nix')
-rw-r--r-- | pkgs/stdenv/freebsd/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 3c4e2bb976617..4c7ebc16239b4 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -1,11 +1,11 @@ { system ? builtins.currentSystem -, allPackages ? import ../../top-level/all-packages.nix +, allPackages ? import ../../.. , platform ? null , config ? {} }: rec { - allPackages = import ../../top-level/all-packages.nix; + allPackages = import ../../..; bootstrapTools = derivation { inherit system; |