Skip to content

wxGTK*: Remove abandoned dependencies #96120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtojnar merged 4 commits into from
Sep 2, 2020
Merged

wxGTK*: Remove abandoned dependencies #96120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55a7a01
wxGTK28: drop ancient deps
jtojnar Aug 23, 2020
6de7492
wxGTK29: drop ancient deps
jtojnar Aug 23, 2020
e2d02a8
wxGTK30-gtk2: drop ancient deps
jtojnar Aug 23, 2020
2fd206f
wxGTK31-gtk2: drop ancient deps
jtojnar Aug 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/libraries/wxwidgets/2.8/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ 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
, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, libGLU ? null, libGL ? null
Expand All @@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
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;

nativeBuildInputs = [ pkgconfig ];
Expand Down
7 changes: 3 additions & 4 deletions pkgs/development/libraries/wxwidgets/2.9/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ 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
, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, libGLU ? null, libGL ? null
Expand Down Expand Up @@ -32,8 +32,7 @@ stdenv.mkDerivation {
];

buildInputs =
[ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer
gst-plugins-base GConf ]
[ gtk2 libXinerama libSM libXxf86vm xorgproto ]
++ optional withMesa libGLU
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];

Expand All @@ -42,7 +41,7 @@ stdenv.mkDerivation {
propagatedBuildInputs = optional stdenv.isDarwin AGL;

configureFlags =
[ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"
[ "--enable-gtk2" "--disable-precomp-headers"
(if compat24 then "--enable-compat24" else "--disable-compat24")
(if compat26 then "--enable-compat26" else "--disable-compat26") ]
++ optional unicode "--enable-unicode"
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/wxwidgets/3.0/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig
, libXinerama, libSM, libXxf86vm
, gtk2, GConf ? null, gtk3
, gtk2, gtk3
, xorgproto, gst_all_1, setfile
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, withMesa ? libGLSupported
Expand Down Expand Up @@ -31,7 +31,7 @@ stdenv.mkDerivation rec {

buildInputs = [
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 withMesa libGLU
++ optional withWebKit webkitgtk
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/wxwidgets/3.1/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig
, libXinerama, libSM, libXxf86vm
, gtk2, GConf ? null, gtk3
, gtk2, gtk3
, xorgproto, gst_all_1, setfile
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, withMesa ? libGLSupported, libGLU ? null, libGL ? null
Expand Down Expand Up @@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

buildInputs = [
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 withMesa libGLU
++ optional withWebKit webkitgtk
Expand Down
8 changes: 1 addition & 7 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15563,19 +15563,15 @@ in
wxGTK30 = wxGTK30-gtk2;
wxGTK31 = wxGTK31-gtk2;

wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 {
inherit (gnome2) GConf;
};
wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { };

wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 {
inherit (gnome2) GConf;
inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
};

wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 {
withGtk2 = true;
inherit (gnome2) GConf;
inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
};
Expand All @@ -15588,7 +15584,6 @@ in

wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 {
withGtk2 = true;
inherit (gnome2) GConf;
inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
};
Expand Down Expand Up @@ -24400,7 +24395,6 @@ in
fsg = callPackage ../games/fsg {
wxGTK = wxGTK28.override {
unicode = false;
gst-plugins-base = null;
};
};

Expand Down