diff options
| author | John Ericson <git@JohnEricson.me> | 2019-11-10 22:32:31 -0500 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-11-11 00:25:24 -0500 |
| commit | 0a63190c3115126e6a571b6ca555fa684b8bf4ed (patch) | |
| tree | 2cdaf1531362e685d3205f2f5fc3983ad7d29ae3 /pkgs/os-specific/windows | |
| parent | 91718534f1f476a727b51a256c93885e57cf602d (diff) | |
windows top-level: Clean up with makeScope
Diffstat (limited to 'pkgs/os-specific/windows')
| -rw-r--r-- | pkgs/os-specific/windows/default.nix | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix index 4621c2da10fb..8c2f3ca54981 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 { }; +}) |