Merge pull request #110062 from MetaDark/pkgs/os-specific/windows

This commit is contained in:
Sandro
2021-01-20 08:37:42 +01:00
committed by GitHub
5 changed files with 5 additions and 5 deletions
@@ -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
}: }:
+1 -1
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.
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }: { lib, stdenv, fetchurl }:
let let
version = "2.5.1"; version = "2.5.1";
@@ -1,4 +1,4 @@
{ stdenv, windows, fetchurl }: { lib, stdenv, windows, fetchurl }:
let let
version = "6.0.0"; version = "6.0.0";
@@ -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";