diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-18 11:07:56 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-18 11:07:56 +0200 |
| commit | f120248daff4f1db2dac63601cfebe9048898d57 (patch) | |
| tree | bfa7d2ddb925d8db4e82539f044cd83d1c554e6d /pkgs/development/libraries/wxwidgets | |
| parent | 4d6f65b81fca657a137954050874e8816c032882 (diff) | |
| parent | 41377252e53a78bd8903a4f3e0e35714e20f6147 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/wxwidgets')
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/3.0/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/3.0/mac.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 72cc32a0a1c9..b33b0b15331a 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig +{ stdenv, fetchFromGitHub, fetchurl, pkgconfig , gtk2, gtk3, libXinerama, libSM, libXxf86vm , xorgproto, gstreamer, gst-plugins-base, GConf, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index 6e559cfb6a94..7a32aba24ff8 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib +{ stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib # darwin only attributes , cf-private, derez, rez, setfile , AGL, Cocoa, Kernel |