public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-06-18 11:07:56 +02:00
parent 4d6f65b81f 41377252e5
commit f120248daf
928 changed files with 2418 additions and 2149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/wxwidgets/3.0/default.nix
View File

@@ -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

2
pkgs/development/libraries/wxwidgets/3.0/mac.nix
View File

@@ -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