public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

windows top-level: Clean up with makeScope

Browse Source
This commit is contained in:
John Ericson 2019-11-10 22:32:31 -05:00
parent 91718534f1
commit 0a63190c31
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkgs/os-specific/windows/default.nix
View File

@ -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 { }; mingwrt = callPackage ./mingwrt { };
mingw_runtime = self.mingwrt; mingw_runtime = mingwrt;
mingw_w64 = callPackage ./mingw-w64 { mingw_w64 = callPackage ./mingw-w64 {
stdenv = crossLibcStdenv; stdenv = crossLibcStdenv;
};
mingw_w64_headers = callPackage ./mingw-w64/headers.nix { };
mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix { };
pthreads = callPackage ./pthread-w32 { };
wxMSW = callPackage ./wxMSW-2.8 { };
libgnurx = callPackage ./libgnurx { };
}; };
in self
mingw_w64_headers = callPackage ./mingw-w64/headers.nix { };
mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix { };
pthreads = callPackage ./pthread-w32 { };
wxMSW = callPackage ./wxMSW-2.8 { };
libgnurx = callPackage ./libgnurx { };
})