Revert "pkgs.path: Avoid copying when used via flake"
This reverts commit 813f9da8ab69f106055dd4a8fead7bc0a21a251b.
commit4acad300acfe47598322965f574aef9bff711c98
authorRobert Hensing <robert@roberthensing.nl>
dateThu 27 Jan 2022, 12:53 (5 years ago)
parent6b9ef93
flake.nix+1−1
@@ -62,7 +62,7 @@
6262 }).nixos.manual.x86_64-linux;
6363 };
6464
65− legacyPackages = forAllSystems (system: import ./. { inherit system; config.path = self.outPath; });
65+ legacyPackages = forAllSystems (system: import ./. { inherit system; });
6666
6767 nixosModules = {
6868 notDetected = import ./nixos/modules/installer/scan/not-detected.nix;
pkgs/top-level/all-packages.nix+1−1
@@ -67,7 +67,7 @@ with pkgs;
6767 clangStdenvNoLibs = mkStdenvNoLibs clangStdenv;
6868
6969 # For convenience, allow callers to get the path to Nixpkgs.
70− path = config.path;
70+ path = ../..;
7171
7272
7373 ### Helper functions.
pkgs/top-level/config.nix−14
@@ -32,20 +32,6 @@ let
3232 feature = "run <literal>checkPhase</literal> by default";
3333 };
3434
35− path = mkOption {
36− type = types.path;
37− default = ../..;
38− defaultText = lib.literalDocBook "a path expression";
39− internal = true;
40− description = ''
41− A reference to Nixpkgs' own sources.
42−
43− This is overridable in order to avoid copying sources unnecessarily,
44− as a path expression that references a store path will not short-circuit
45− to the store path itself, but copy the store path instead.
46− '';
47− };
48−
4935 };
5036
5137in {