summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2022-01-27 12:53:30 +0100
committerRobert Hensing <robert@roberthensing.nl>2022-01-27 12:53:30 +0100
commit4acad300acfe47598322965f574aef9bff711c98 (patch)
tree581194d0dd33a3c9a2328a9aed456a776bf5e6b0
parent6b9ef93b98c053ef6390ef96092b3b302773a4aa (diff)
downloadnixpkgs-4acad300acfe47598322965f574aef9bff711c98.tar
nixpkgs-4acad300acfe47598322965f574aef9bff711c98.tar.gz
nixpkgs-4acad300acfe47598322965f574aef9bff711c98.tar.bz2
nixpkgs-4acad300acfe47598322965f574aef9bff711c98.tar.lz
nixpkgs-4acad300acfe47598322965f574aef9bff711c98.tar.xz
nixpkgs-4acad300acfe47598322965f574aef9bff711c98.tar.zst
nixpkgs-4acad300acfe47598322965f574aef9bff711c98.zip
Revert "pkgs.path: Avoid copying when used via flake"
This reverts commit 813f9da8ab69f106055dd4a8fead7bc0a21a251b.
-rw-r--r--flake.nix2
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/config.nix14
3 files changed, 2 insertions, 16 deletions
diff --git a/flake.nix b/flake.nix
index c2306768d6f..29dffa9fa4e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,7 +62,7 @@
         }).nixos.manual.x86_64-linux;
       };
 
-      legacyPackages = forAllSystems (system: import ./. { inherit system; config.path = self.outPath; });
+      legacyPackages = forAllSystems (system: import ./. { inherit system; });
 
       nixosModules = {
         notDetected = import ./nixos/modules/installer/scan/not-detected.nix;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54e661d6af0..413f2ae521e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -67,7 +67,7 @@ with pkgs;
   clangStdenvNoLibs = mkStdenvNoLibs clangStdenv;
 
   # For convenience, allow callers to get the path to Nixpkgs.
-  path = config.path;
+  path = ../..;
 
 
   ### Helper functions.
diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix
index bb4f668d60f..7a5b4bdd179 100644
--- a/pkgs/top-level/config.nix
+++ b/pkgs/top-level/config.nix
@@ -32,20 +32,6 @@ let
       feature = "run <literal>checkPhase</literal> by default";
     };
 
-    path = mkOption {
-      type = types.path;
-      default = ../..;
-      defaultText = lib.literalDocBook "a path expression";
-      internal = true;
-      description = ''
-        A reference to Nixpkgs' own sources.
-
-        This is overridable in order to avoid copying sources unnecessarily,
-        as a path expression that references a store path will not short-circuit
-        to the store path itself, but copy the store path instead.
-      '';
-    };
-
   };
 
 in {