Merge branch 'master' into improved-make-overridable

2017-09-12 17:30:35 -04:00
parent 4d860389d8 734788b71d
commit dbd5009376
1921 changed files with 38401 additions and 26547 deletions
@@ -61,7 +61,7 @@ let

  mkDerivation = makeOverridable mkDerivationImpl;

-  mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope;
+  mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // { inherit stdenv; } // scope;
  defaultScope = mkScope self;
  callPackage = drv: args: callPackageWith defaultScope drv args;