alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

pkgs/os-specific/windows: fix evaluation after stdenv.lib -> lib

Browse source 
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.
This commit is contained in:
Kira Bruneau 2021-01-19 21:09:31 -05:00
parent 35b89f31e3
commit 9788188273
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/os-specific/windows/cygwin-setup/default.nix
View file

@ -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 , zlib, bzip2, lzma, libgcrypt
}: }:

2
pkgs/os-specific/windows/jom/default.nix
View file

@ -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 # At the time of committing this, the expression fails for me to cross-build in
# both mingw32 and mingw64. # both mingw32 and mingw64.

2
pkgs/os-specific/windows/libgnurx/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl }: { lib, stdenv, fetchurl }:
let let
version = "2.5.1"; version = "2.5.1";

2
pkgs/os-specific/windows/mingw-w64/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, windows, fetchurl }: { lib, stdenv, windows, fetchurl }:
let let
version = "6.0.0"; version = "6.0.0";

2
pkgs/os-specific/windows/wxMSW-2.8/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }: { lib, stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "wxMSW-2.8.11"; name = "wxMSW-2.8.11";