summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas B. Pierron <nicolas.b.pierron@gmail.com>2016-03-20 19:04:15 +0000
committerNicolas B. Pierron <nicolas.b.pierron@gmail.com>2016-03-20 19:04:15 +0000
commit21b8007bcfb83db36e502efefb541a28a4571fbb (patch)
tree5c8bebf0f8028e31e2718d1df7c75a314134742a
parent9e8c5208a1370be720ccce8c42e17e0922ba0159 (diff)
downloadnixlib-21b8007bcfb83db36e502efefb541a28a4571fbb.tar
nixlib-21b8007bcfb83db36e502efefb541a28a4571fbb.tar.gz
nixlib-21b8007bcfb83db36e502efefb541a28a4571fbb.tar.bz2
nixlib-21b8007bcfb83db36e502efefb541a28a4571fbb.tar.lz
nixlib-21b8007bcfb83db36e502efefb541a28a4571fbb.tar.xz
nixlib-21b8007bcfb83db36e502efefb541a28a4571fbb.tar.zst
nixlib-21b8007bcfb83db36e502efefb541a28a4571fbb.zip
Move the customOverrides after the stdenvOverrides.
This change is not backward compatible, in the sense that this allow you to
override the packages which used to be overriden by the last stage of
stdenv.  Note, this does not mean that these packages would be used by
stdenv.
-rw-r--r--pkgs/top-level/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index b641d54a5ae7..66a99847698a 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -140,10 +140,10 @@ let
       pkgs_5 = pkgs_4 // allPackages pkgs pkgs_4;
       pkgs_6 = pkgs_5 // aliases pkgs pkgs_5;
 
-      pkgs_7 = pkgs_6 // customOverrides pkgs pkgs_6;
+      pkgs_7 = pkgs_6 // stdenvOverrides pkgs pkgs_6;
 
       # The overriden, final packages.
-      pkgs =   pkgs_7 // stdenvOverrides pkgs pkgs_6;
+      pkgs =   pkgs_7 // customOverrides pkgs pkgs_6;
     in pkgs;
 
 in