diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 21:45:37 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-17 23:26:08 +0700 |
commit | 16d91ee628d781c721506b19e3e03bed810327e8 (patch) | |
tree | f65e50a70b4ff72314f384c6b29f4902b03f45f3 /pkgs/os-specific/windows | |
parent | 979e6e67d32a934dcc39dedfd588baf6e3f7ed78 (diff) |
pkgs/os-specific: stdenv.lib -> lib
Diffstat (limited to 'pkgs/os-specific/windows')
-rw-r--r-- | pkgs/os-specific/windows/cygwin-setup/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/windows/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/windows/jom/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/windows/libgnurx/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/windows/mingw-w64/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/windows/wxMSW-2.8/default.nix | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index 16b07507695b..aec605111b58 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -2,7 +2,7 @@ , zlib, bzip2, lzma, libgcrypt }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "cygwin-setup"; diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix index 7f1634d5c0b3..7c8041206caa 100644 --- a/pkgs/os-specific/windows/default.nix +++ b/pkgs/os-specific/windows/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPackages +{ lib, stdenv, buildPackages , newScope, overrideCC, crossLibcStdenv, libcCross }: -stdenv.lib.makeScope newScope (self: with self; { +lib.makeScope newScope (self: with self; { cygwinSetup = callPackage ./cygwin-setup { }; diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 1f42330be35c..0d3ab81135c6 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { # cmakeFlags = [ "-DWIN32=1" "-DCMAKE_SYSTEM_NAME=Windows" "-DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres" ]; - preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preBuild = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' export NIX_CROSS_CFLAGS_COMPILE=-fpermissive ''; meta = { homepage = "http://qt-project.org/wiki/jom"; description = "Clone of nmake supporting multiple independent commands in parallel"; - license = stdenv.lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later. + license = lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later. }; } diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix index fedfea15ccb0..eb4ae8dad008 100644 --- a/pkgs/os-specific/windows/libgnurx/default.nix +++ b/pkgs/os-specific/windows/libgnurx/default.nix @@ -11,6 +11,6 @@ in stdenv.mkDerivation rec { }; meta = { - platforms = stdenv.lib.platforms.windows; + platforms = lib.platforms.windows; }; } diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 6c17e0718bb5..838c39fc3c13 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -25,6 +25,6 @@ in stdenv.mkDerivation { hardeningDisable = [ "stackprotector" "fortify" ]; meta = { - platforms = stdenv.lib.platforms.windows; + platforms = lib.platforms.windows; }; } diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index 4dc886915b73..f57df3192ccf 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { passthru = {inherit compat24 compat26 unicode;}; meta = { - platforms = stdenv.lib.platforms.windows; + platforms = lib.platforms.windows; broken = true; }; |