summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2022-03-15 12:22:16 +0100
committerRobert Hensing <robert@roberthensing.nl>2022-05-02 08:49:33 +0200
commit0e00acafe9dc8bbd9e6b49d4341b6bf49b6defb8 (patch)
treec1b0fbd649b3788e040c4d7bfb1e615979c75be4 /pkgs/stdenv
parentf066dddaa5cb6aea4429cd9386d4aa6f3963a889 (diff)
downloadnixpkgs-0e00acafe9dc8bbd9e6b49d4341b6bf49b6defb8.tar
nixpkgs-0e00acafe9dc8bbd9e6b49d4341b6bf49b6defb8.tar.gz
nixpkgs-0e00acafe9dc8bbd9e6b49d4341b6bf49b6defb8.tar.bz2
nixpkgs-0e00acafe9dc8bbd9e6b49d4341b6bf49b6defb8.tar.lz
nixpkgs-0e00acafe9dc8bbd9e6b49d4341b6bf49b6defb8.tar.xz
nixpkgs-0e00acafe9dc8bbd9e6b49d4341b6bf49b6defb8.tar.zst
nixpkgs-0e00acafe9dc8bbd9e6b49d4341b6bf49b6defb8.zip
stdenv.mkDerivation: public -> finalPackage
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/generic/make-derivation.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 3e3a7aa790d..6d9f6a9e336 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -24,10 +24,10 @@ let
       # separate lines, because Nix would only show the last line of the comment.
 
       # An infinite recursion here can be caused by having the attribute names of expression `e` in `.overrideAttrs(finalAttrs: previousAttrs: e)` depend on `finalAttrs`. Only the attribute values of `e` can depend on `finalAttrs`.
-      args = rattrs (args // { inherit public; });
+      args = rattrs (args // { inherit finalPackage; });
       #              ^^^^
 
-      public =
+      finalPackage =
         mkDerivationSimple
           (f0:
             let
@@ -51,7 +51,7 @@ let
               makeDerivationExtensible mkDerivationSimple
                 (self: let super = rattrs self; in super // f self super))
           args;
-    in public;
+    in finalPackage;
 
   # makeDerivationExtensibleConst == makeDerivationExtensible (_: attrs),
   # but pre-evaluated for a slight improvement in performance.