1 files changed, 16 insertions, 18 deletions
diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix
index 4621c2da10f..8c2f3ca5498 100644
--- a/pkgs/os-specific/windows/default.nix
+++ b/pkgs/os-specific/windows/default.nix
@@ -1,29 +1,27 @@
-{ newScope, crossLibcStdenv }: let
+{ stdenv, newScope, crossLibcStdenv }:
 
-  callPackage = newScope self;
+stdenv.lib.makeScope newScope (self: with self; {
 
-  self = {
-    cygwinSetup = callPackage ./cygwin-setup { };
+  cygwinSetup = callPackage ./cygwin-setup { };
 
-    jom = callPackage ./jom { };
+  jom = callPackage ./jom { };
 
-    w32api = callPackage ./w32api { };
+  w32api = callPackage ./w32api { };
 
-    mingwrt = callPackage ./mingwrt { };
-    mingw_runtime = self.mingwrt;
+  mingwrt = callPackage ./mingwrt { };
+  mingw_runtime = mingwrt;
 
-    mingw_w64 = callPackage ./mingw-w64 {
-      stdenv = crossLibcStdenv;
-    };
+  mingw_w64 = callPackage ./mingw-w64 {
+    stdenv = crossLibcStdenv;
+  };
 
-    mingw_w64_headers = callPackage ./mingw-w64/headers.nix { };
+  mingw_w64_headers = callPackage ./mingw-w64/headers.nix { };
 
-    mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix { };
+  mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix { };
 
-    pthreads = callPackage ./pthread-w32 { };
+  pthreads = callPackage ./pthread-w32 { };
 
-    wxMSW = callPackage ./wxMSW-2.8 { };
+  wxMSW = callPackage ./wxMSW-2.8 { };
 
-    libgnurx = callPackage ./libgnurx { };
-  };
-in self
+  libgnurx = callPackage ./libgnurx { };
+})