From 97881882738abcc15f587806a4bed2be52803fc6 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 19 Jan 2021 21:09:31 -0500 Subject: [PATCH] pkgs/os-specific/windows: fix evaluation after stdenv.lib -> lib Fixes the evaluation of packages in pkgs/os-specific/windows that weren't updated to include a new lib parameter after the refactor from stdenv.lib -> lib (#109490). I originally only intended this change to fix `pkgsCross.mingw32.buildPackages.gcc` & `pkgsCross.mingwW64.buildPackages.gcc` to support building wine with `mingwSupport`, but I noticed this was an issue for all updated windows packages. Most of these other packages fail to build for other reasons. --- pkgs/os-specific/windows/cygwin-setup/default.nix | 2 +- pkgs/os-specific/windows/jom/default.nix | 2 +- pkgs/os-specific/windows/libgnurx/default.nix | 2 +- pkgs/os-specific/windows/mingw-w64/default.nix | 2 +- pkgs/os-specific/windows/wxMSW-2.8/default.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index 2941561954d..c51cafa9ace 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config +{ lib, stdenv, fetchcvs, autoconf, automake, libtool, flex, bison, pkg-config , zlib, bzip2, lzma, libgcrypt }: diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 0d3ab81135c..a2fbdde95aa 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qt48, qmake4Hook, flex }: +{ lib, stdenv, fetchgit, qt48, qmake4Hook, flex }: # At the time of committing this, the expression fails for me to cross-build in # both mingw32 and mingw64. diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix index eb4ae8dad00..85a3c463a28 100644 --- a/pkgs/os-specific/windows/libgnurx/default.nix +++ b/pkgs/os-specific/windows/libgnurx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "2.5.1"; diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 838c39fc3c1..0a342997530 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,4 +1,4 @@ -{ stdenv, windows, fetchurl }: +{ lib, stdenv, windows, fetchurl }: let version = "6.0.0"; diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index f57df3192cc..c4fb7993343 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }: +{ lib, stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }: stdenv.mkDerivation { name = "wxMSW-2.8.11";