windows top-level: Clean up with makeScope

This commit is contained in:
John Ericson 2019-11-10 22:32:31 -05:00
parent 91718534f1
commit 0a63190c31

View File

@ -1,8 +1,7 @@
{ 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 { };
@ -10,7 +9,7 @@
w32api = callPackage ./w32api { }; w32api = callPackage ./w32api { };
mingwrt = callPackage ./mingwrt { }; mingwrt = callPackage ./mingwrt { };
mingw_runtime = self.mingwrt; mingw_runtime = mingwrt;
mingw_w64 = callPackage ./mingw-w64 { mingw_w64 = callPackage ./mingw-w64 {
stdenv = crossLibcStdenv; stdenv = crossLibcStdenv;
@ -25,5 +24,4 @@
wxMSW = callPackage ./wxMSW-2.8 { }; wxMSW = callPackage ./wxMSW-2.8 { };
libgnurx = callPackage ./libgnurx { }; libgnurx = callPackage ./libgnurx { };
}; })
in self