diff --git a/boot/boot-stage-1.nix b/boot/boot-stage-1.nix index c26c8d1a096..33fa668e080 100644 --- a/boot/boot-stage-1.nix +++ b/boot/boot-stage-1.nix @@ -4,28 +4,28 @@ # calls the init in the root file system to start the second boot # stage. -{ pkgs, config, nixpkgsPath, kernelPackages, modulesTree }: +{ pkgs, config, kernelPackages, modulesTree }: rec { - pkgsDiet = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" { + pkgsDiet = import "${pkgs.path}/top-level/all-packages.nix" { system = pkgs.stdenv.system; bootStdenv = pkgs.useDietLibC pkgs.stdenv; }; - pkgsKlibc = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" { + pkgsKlibc = import "${pkgs.path}/top-level/all-packages.nix" { system = pkgs.stdenv.system; bootStdenv = pkgs.useKlibc pkgs.stdenv kernelPackages.klibc; }; - pkgsStatic = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" { + pkgsStatic = import "${pkgs.path}/top-level/all-packages.nix" { system = pkgs.stdenv.system; bootStdenv = pkgs.makeStaticBinaries pkgs.stdenv; }; - stdenvLinuxStuff = import "${nixpkgsPath}/pkgs/stdenv/linux" { + stdenvLinuxStuff = import "${pkgs.path}/stdenv/linux" { system = pkgs.stdenv.system; - allPackages = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix"; + allPackages = import "${pkgs.path}/top-level/all-packages.nix"; }; diff --git a/installer/default.nix b/installer/default.nix index bf6f6ee81b9..dfa2ab38eeb 100644 --- a/installer/default.nix +++ b/installer/default.nix @@ -1,4 +1,4 @@ -{pkgs, config, nix, nixpkgsPath}: +{pkgs, config, nix}: let @@ -25,7 +25,7 @@ in inherit nix; nixpkgsURL = config.installer.nixpkgsURL; - pathsFromGraph = "${nixpkgsPath}/pkgs/build-support/kernel/paths-from-graph.pl"; + pathsFromGraph = "${pkgs.path}/build-support/kernel/paths-from-graph.pl"; nixClosure = pkgs.runCommand "closure" {exportReferencesGraph = ["refs" nix];} diff --git a/system/system.nix b/system/system.nix index a102b6f012b..b79278d2a72 100644 --- a/system/system.nix +++ b/system/system.nix @@ -41,7 +41,7 @@ rec { # The initial ramdisk. initialRamdiskStuff = import ../boot/boot-stage-1.nix { - inherit pkgs config nixpkgsPath kernelPackages modulesTree; + inherit pkgs config kernelPackages modulesTree; }; initialRamdisk = initialRamdiskStuff.initialRamdisk; @@ -49,7 +49,7 @@ rec { # NixOS installation/updating tools. nixosTools = import ../installer { - inherit pkgs config nix nixpkgsPath; + inherit pkgs config nix; };