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

Merge pull request #96120 from jtojnar/cleaner-wx

Browse Source
This commit is contained in:
Jan Tojnar 2020-09-02 02:06:34 +02:00 committed by GitHub
commit 840116150c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/wxwidgets/2.8/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
, gstreamer, gst-plugins-base, GConf, libX11, cairo , libX11, cairo
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, libGLU ? null, libGL ? null , libGLU ? null, libGL ? null
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz";
}; };
buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf libX11 cairo ] buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ]
++ optional withMesa libGLU; ++ optional withMesa libGLU;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

7
pkgs/development/libraries/wxwidgets/2.9/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
, gstreamer, gst-plugins-base, GConf, setfile , setfile
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, libGLU ? null, libGL ? null , libGLU ? null, libGL ? null
@ -32,8 +32,7 @@ stdenv.mkDerivation {
]; ];
buildInputs = buildInputs =
[ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer [ gtk2 libXinerama libSM libXxf86vm xorgproto ]
gst-plugins-base GConf ]
++ optional withMesa libGLU ++ optional withMesa libGLU
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];
@ -42,7 +41,7 @@ stdenv.mkDerivation {
propagatedBuildInputs = optional stdenv.isDarwin AGL; propagatedBuildInputs = optional stdenv.isDarwin AGL;
configureFlags = configureFlags =
[ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl" [ "--enable-gtk2" "--disable-precomp-headers"
(if compat24 then "--enable-compat24" else "--disable-compat24") (if compat24 then "--enable-compat24" else "--disable-compat24")
(if compat26 then "--enable-compat26" else "--disable-compat26") ] (if compat26 then "--enable-compat26" else "--disable-compat26") ]
++ optional unicode "--enable-unicode" ++ optional unicode "--enable-unicode"

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig { stdenv, fetchFromGitHub, fetchurl, pkgconfig
, libXinerama, libSM, libXxf86vm , libXinerama, libSM, libXxf86vm
, gtk2, GConf ? null, gtk3 , gtk2, gtk3
, xorgproto, gst_all_1, setfile , xorgproto, gst_all_1, setfile
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, withMesa ? libGLSupported , withMesa ? libGLSupported
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base
] ++ optionals withGtk2 [ gtk2 GConf ] ] ++ optionals withGtk2 [ gtk2 ]
++ optional (!withGtk2) gtk3 ++ optional (!withGtk2) gtk3
++ optional withMesa libGLU ++ optional withMesa libGLU
++ optional withWebKit webkitgtk ++ optional withWebKit webkitgtk

4
pkgs/development/libraries/wxwidgets/3.1/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig { stdenv, fetchFromGitHub, fetchurl, pkgconfig
, libXinerama, libSM, libXxf86vm , libXinerama, libSM, libXxf86vm
, gtk2, GConf ? null, gtk3 , gtk2, gtk3
, xorgproto, gst_all_1, setfile , xorgproto, gst_all_1, setfile
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, withMesa ? libGLSupported, libGLU ? null, libGL ? null , withMesa ? libGLSupported, libGLU ? null, libGL ? null
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base
] ++ optionals withGtk2 [ gtk2 GConf ] ] ++ optionals withGtk2 [ gtk2 ]
++ optional (!withGtk2) gtk3 ++ optional (!withGtk2) gtk3
++ optional withMesa libGLU ++ optional withMesa libGLU
++ optional withWebKit webkitgtk ++ optional withWebKit webkitgtk

8
pkgs/top-level/all-packages.nix
View File

@ -15716,19 +15716,15 @@ in
wxGTK30 = wxGTK30-gtk2; wxGTK30 = wxGTK30-gtk2;
wxGTK31 = wxGTK31-gtk2; wxGTK31 = wxGTK31-gtk2;
wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { };
inherit (gnome2) GConf;
};
wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 {
inherit (gnome2) GConf;
inherit (darwin.stubs) setfile; inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
}; };
wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 {
withGtk2 = true; withGtk2 = true;
inherit (gnome2) GConf;
inherit (darwin.stubs) setfile; inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
}; };
@ -15741,7 +15737,6 @@ in
wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 {
withGtk2 = true; withGtk2 = true;
inherit (gnome2) GConf;
inherit (darwin.stubs) setfile; inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
}; };
@ -24637,7 +24632,6 @@ in
fsg = callPackage ../games/fsg { fsg = callPackage ../games/fsg {
wxGTK = wxGTK28.override { wxGTK = wxGTK28.override {
unicode = false; unicode = false;
gst-plugins-base = null;
}; };
}; };