summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2022-12-03 03:28:32 +0100
committerWeijia Wang <9713184+wegank@users.noreply.github.com>2022-12-03 03:28:32 +0100
commit07cd65bea252c7cf7aeaec9d9b63d51bb8308af5 (patch)
tree8b3fbc244c296f45321c47ecbd7130bddebae421
parentcee75d23a9825985cad20b0deaac752766f6725c (diff)
treewide: drop wxGTK30-gtk2
-rw-r--r--pkgs/applications/audio/sooperlooper/default.nix4
-rw-r--r--pkgs/applications/audio/spek/default.nix4
-rw-r--r--pkgs/applications/emulators/dolphin-emu/default.nix4
-rw-r--r--pkgs/applications/misc/lenmus/default.nix4
-rw-r--r--pkgs/applications/misc/lutris/fhsenv.nix2
-rw-r--r--pkgs/applications/misc/mediainfo-gui/default.nix4
-rw-r--r--pkgs/applications/misc/pwsafe/default.nix4
-rw-r--r--pkgs/applications/networking/ftp/filezilla/default.nix7
-rw-r--r--pkgs/applications/science/astronomy/phd2/default.nix4
-rw-r--r--pkgs/applications/version-management/rapidsvn/default.nix4
-rw-r--r--pkgs/applications/video/dvdstyler/default.nix4
-rw-r--r--pkgs/development/libraries/openscenegraph/default.nix4
-rw-r--r--pkgs/development/libraries/wxwidgets/wxGTK30.nix10
-rw-r--r--pkgs/development/python-modules/wxPython/4.0.nix5
-rw-r--r--pkgs/games/megaglest/default.nix6
-rw-r--r--pkgs/games/rigsofrods/default.nix4
-rw-r--r--pkgs/servers/klipper/klipper-firmware.nix4
-rw-r--r--pkgs/tools/networking/p2p/amule/default.nix4
-rw-r--r--pkgs/tools/text/poedit/default.nix4
-rw-r--r--pkgs/top-level/aliases.nix2
-rw-r--r--pkgs/top-level/all-packages.nix13
-rw-r--r--pkgs/top-level/perl-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix2
23 files changed, 49 insertions, 56 deletions
diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix
index a05a0174afc0..63cb7398201b 100644
--- a/pkgs/applications/audio/sooperlooper/default.nix
+++ b/pkgs/applications/audio/sooperlooper/default.nix
@@ -9,7 +9,7 @@
, libxml2
, libjack2
, libsndfile
-, wxGTK30-gtk3
+, wxGTK30
, libsigcxx
, libsamplerate
, rubberband
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
libxml2
libjack2
libsndfile
- wxGTK30-gtk3
+ wxGTK30
libsigcxx
libsamplerate
rubberband
diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix
index 1a73b8adea72..74c53f96efdc 100644
--- a/pkgs/applications/audio/spek/default.nix
+++ b/pkgs/applications/audio/spek/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK30, gtk3, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "spek";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ];
- buildInputs = [ ffmpeg wxGTK30-gtk3 wxGTK30-gtk3.gtk ];
+ buildInputs = [ ffmpeg wxGTK30 gtk3 ];
meta = with lib; {
description = "Analyse your audio files by showing their spectrogram";
diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix
index 5eec3c865df5..b27937a6b838 100644
--- a/pkgs/applications/emulators/dolphin-emu/default.nix
+++ b/pkgs/applications/emulators/dolphin-emu/default.nix
@@ -21,7 +21,7 @@
, fetchFromGitHub
, libusb1
, libevdev
-, wxGTK30-gtk3
+, wxGTK30
, soundtouch
, miniupnpc
, mbedtls
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
portaudio
libusb1
libpulseaudio
- wxGTK30-gtk3
+ wxGTK30
soundtouch
miniupnpc
mbedtls
diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix
index f50dd23ff013..023045d67917 100644
--- a/pkgs/applications/misc/lenmus/default.nix
+++ b/pkgs/applications/misc/lenmus/default.nix
@@ -11,7 +11,7 @@
, libpng
, pngpp
, zlib
-, wxGTK30-gtk3
+, wxGTK30
, wxsqlite3
}:
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
libpng
pngpp
zlib
- wxGTK30-gtk3
+ wxGTK30
wxsqlite3
];
diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix
index b4b2b2e2ac5d..5c39576ac6f3 100644
--- a/pkgs/applications/misc/lutris/fhsenv.nix
+++ b/pkgs/applications/misc/lutris/fhsenv.nix
@@ -30,7 +30,7 @@ in buildFHSUserEnv {
# DGen // TODO: libarchive is broken
# Dolphin
- bluez ffmpeg gettext portaudio wxGTK30-gtk3 miniupnpc mbedtls lzo sfml gsm
+ bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm
wavpack orc nettle gmp pcre vulkan-loader
# DOSBox
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index a15733dd526c..b3ca8032b196 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK30-gtk3
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK30
, desktop-file-utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [ libmediainfo wxGTK30-gtk3 desktop-file-utils libSM imagemagick ];
+ buildInputs = [ libmediainfo wxGTK30 desktop-file-utils libSM imagemagick ];
sourceRoot = "./MediaInfo/Project/GNU/GUI/";
diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix
index 75f09742c1e2..8f8aef6c8cfd 100644
--- a/pkgs/applications/misc/pwsafe/default.nix
+++ b/pkgs/applications/misc/pwsafe/default.nix
@@ -6,7 +6,7 @@
, zip
, gettext
, perl
-, wxGTK30-gtk3
+, wxGTK30
, libXext
, libXi
, libXt
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
libXi
libXt
libXtst
- wxGTK30-gtk3
+ wxGTK30
curl
qrencode
libuuid
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 5a4585135f01..49f2aaa37e9c 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -12,7 +12,8 @@
, sqlite
, tinyxml
, wrapGAppsHook
-, wxGTK30-gtk3
+, wxGTK30
+, gtk3
, xdg-utils
}:
@@ -42,8 +43,8 @@ stdenv.mkDerivation rec {
pugixml
sqlite
tinyxml
- wxGTK30-gtk3
- wxGTK30-gtk3.gtk
+ wxGTK30
+ gtk3
xdg-utils
];
diff --git a/pkgs/applications/science/astronomy/phd2/default.nix b/pkgs/applications/science/astronomy/phd2/default.nix
index 52049302a27b..dc84dcfd98d7 100644
--- a/pkgs/applications/science/astronomy/phd2/default.nix
+++ b/pkgs/applications/science/astronomy/phd2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK30-gtk3
+{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK30
, curl, gettext, glib, indi-full, libnova, wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3
- wxGTK30-gtk3
+ wxGTK30
curl
gettext
glib
diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix
index 4bede0ac82b6..0027af3defe9 100644
--- a/pkgs/applications/version-management/rapidsvn/default.nix
+++ b/pkgs/applications/version-management/rapidsvn/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, wxGTK30-gtk3, subversion, apr, aprutil, python3, fetchpatch }:
+{ lib, stdenv, fetchurl, wxGTK30, subversion, apr, aprutil, python3, fetchpatch }:
stdenv.mkDerivation rec {
pname = "rapidsvn";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
};
- buildInputs = [ wxGTK30-gtk3 subversion apr aprutil python3 ];
+ buildInputs = [ wxGTK30 subversion apr aprutil python3 ];
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix
index 8d42c2b2bfd6..cd3691458336 100644
--- a/pkgs/applications/video/dvdstyler/default.nix
+++ b/pkgs/applications/video/dvdstyler/default.nix
@@ -17,7 +17,7 @@
, libjpeg
, pkg-config
, wrapGAppsHook
-, wxGTK30-gtk3 # crash with wxGTK30 with GTK2 compat
+, wxGTK30 # crash with wxGTK30 with GTK2 compat
, wxSVG
, xine-ui
, xmlto
@@ -62,7 +62,7 @@ in stdenv.mkDerivation rec {
libexif
libjpeg
wxSVG
- wxGTK30-gtk3
+ wxGTK30
xine-ui
]
++ optionals dvdisasterSupport [ dvdisaster ]
diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index 885fbb058bd1..3a6a7b57c40f 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -23,7 +23,7 @@
sdlSupport ? false, SDL2,
restSupport ? false, asio,
withApps ? false,
- withExamples ? false, fltk, wxGTK30-gtk3,
+ withExamples ? false, fltk, wxGTK30,
}:
stdenv.mkDerivation rec {
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
++ lib.optional luaSupport lua
++ lib.optional sdlSupport SDL2
++ lib.optional restSupport asio
- ++ lib.optionals withExamples [ fltk wxGTK30-gtk3 ]
+ ++ lib.optionals withExamples [ fltk wxGTK30 ]
++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ]
++ lib.optional (restSupport || colladaSupport) boost
;
diff --git a/pkgs/development/libraries/wxwidgets/wxGTK30.nix b/pkgs/development/libraries/wxwidgets/wxGTK30.nix
index 3b848f788c10..b60e1f486dc8 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK30.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK30.nix
@@ -3,8 +3,6 @@
, expat
, fetchFromGitHub
, gst_all_1
-, withGtk2 ? true
-, gtk2
, gtk3
, libGL
, libGLU
@@ -34,11 +32,6 @@
, WebKit
}:
-assert withGtk2 -> (!withWebKit);
-
-let
- gtk = if withGtk2 then gtk2 else gtk3;
-in
stdenv.mkDerivation rec {
pname = "wxwidgets";
version = "3.0.5.1";
@@ -60,7 +53,7 @@ stdenv.mkDerivation rec {
libjpeg_turbo
zlib
] ++ lib.optionals stdenv.isLinux [
- gtk
+ gtk3
libSM
libXinerama
libXxf86vm
@@ -148,7 +141,6 @@ stdenv.mkDerivation rec {
};
passthru = {
- inherit gtk;
inherit compat26 compat28 unicode;
};
}
diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix
index d9fead66e355..380fefbc4cd0 100644
--- a/pkgs/development/python-modules/wxPython/4.0.nix
+++ b/pkgs/development/python-modules/wxPython/4.0.nix
@@ -12,6 +12,7 @@
, ncurses
, libintl
, wxGTK
+, gtk3
, IOKit
, Carbon
, Cocoa
@@ -42,7 +43,7 @@ buildPythonPackage rec {
then
[ AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL ]
else
- [ wxGTK.gtk ]
+ [ gtk3 ]
);
propagatedBuildInputs = [
@@ -58,7 +59,7 @@ buildPythonPackage rec {
--replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")'
substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
--replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [
- ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-2.0.so"),
+ ("gdk", "${gtk3}/lib/libgtk-x11-2.0.so"),
("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"),
("appsvc", None)
]}'
diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix
index 21ee6fa37448..e8558af0732a 100644
--- a/pkgs/games/megaglest/default.nix
+++ b/pkgs/games/megaglest/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc
-, libjpeg, wxGTK30-gtk3, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng
+, libjpeg, wxGTK30, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng
, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib
, fetchFromGitHub, fetchpatch
}:
@@ -9,7 +9,7 @@ let
name = "megaglest-lib-env";
paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext
xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype
- stdenv.cc.cc glew libGLU wxGTK30-gtk3 ];
+ stdenv.cc.cc glew libGLU wxGTK30 ];
};
path-env = buildEnv {
name = "megaglest-path-env";
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
];
nativeBuildInputs = [ cmake pkg-config makeWrapper git ];
- buildInputs = [ curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK30-gtk3
+ buildInputs = [ curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK30
glib cppunit fontconfig freetype ftgl glew libogg libvorbis libGLU ];
cmakeFlags = [
diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
index 1e1b8130e377..c3bf4498fa4b 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, lib, stdenv, wxGTK30-gtk3, freeimage, cmake, zziplib, libGLU, libGL, boost,
+{ fetchFromGitHub, lib, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU, libGL, boost,
pkg-config, libuuid, openal, ogre, ois, curl, gtk3, mygui, unzip,
angelscript, ogrepaged, mysocketw, libxcb
}:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ cmake pkg-config unzip ];
- buildInputs = [ wxGTK30-gtk3 freeimage zziplib libGLU libGL boost
+ buildInputs = [ wxGTK30 freeimage zziplib libGLU libGL boost
libuuid openal ogre ois curl gtk3 mygui angelscript
ogrepaged mysocketw libxcb ];
diff --git a/pkgs/servers/klipper/klipper-firmware.nix b/pkgs/servers/klipper/klipper-firmware.nix
index 3d37f91b11f6..4c9e4e293542 100644
--- a/pkgs/servers/klipper/klipper-firmware.nix
+++ b/pkgs/servers/klipper/klipper-firmware.nix
@@ -5,7 +5,7 @@
, bintools-unwrapped
, libffi
, libusb1
-, wxGTK30-gtk3
+, wxGTK30
, python3
, gcc-arm-embedded
, klipper
@@ -28,7 +28,7 @@
avrdude
stm32flash
pkg-config
- wxGTK30-gtk3 # Required for bossac
+ wxGTK30 # Required for bossac
];
preBuild = "cp ${firmwareConfig} ./.config";
diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index 7538bb941260..8cd0f7935ecf 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@@ -7,7 +7,7 @@
, lib
, cmake
, zlib
-, wxGTK30-gtk3 # WxGTK 3.0 must be used because aMule does not yet work well with 3.1
+, wxGTK30 # WxGTK 3.0 must be used because aMule does not yet work well with 3.1
, perl
, cryptopp
, libupnp
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
buildInputs = [
zlib
- wxGTK30-gtk3
+ wxGTK30
perl
cryptopp.dev
libupnp
diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix
index 1a9f33438c8b..37fc346eb0a9 100644
--- a/pkgs/tools/text/poedit/default.nix
+++ b/pkgs/tools/text/poedit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3,
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30,
boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml,
nlohmann_json, hicolor-icon-theme, wrapGAppsHook }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
libxslt xmlto boost libtool pkg-config ];
- buildInputs = [ lucenepp nlohmann_json wxGTK30-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ];
+ buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ];
propagatedBuildInputs = [ gettext ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a316b8ada750..c73138a9fa58 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1590,6 +1590,8 @@ mapAliases ({
wxGTK = throw "wxGTK28 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04
wxGTK28 = throw "wxGTK28 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04
wxGTK29 = throw "wxGTK29 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04
+ wxGTK30-gtk2 = throw "'wxGTK30-gtk2' has been removed from nixpkgs as it depends on deprecated GTK2"; # Added 2022-12-03
+ wxGTK30-gtk3 = throw "'wxGTK30-gtk3' has been renamed to/replaced by 'wxGTK30'"; # Added 2022-12-03
wxGTK31-gtk2 = throw "'wxGTK31-gtk2' has been removed from nixpkgs as it depends on deprecated GTK2"; # Added 2022-10-27
wxGTK31-gtk3 = throw "'wxGTK31-gtk3' has been renamed to/replaced by 'wxGTK31'"; # Added 2022-10-27
wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae7a2ba26138..caa9af0105e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2062,7 +2062,7 @@ with pkgs;
pcem = callPackage ../applications/emulators/pcem { };
pcsx2 = callPackage ../applications/emulators/pcsx2 {
- wxGTK = wxGTK30-gtk3;
+ wxGTK = wxGTK30;
};
pcsxr = callPackage ../applications/emulators/pcsxr { };
@@ -10682,7 +10682,7 @@ with pkgs;
pod2mdoc = callPackage ../tools/misc/pod2mdoc { };
poedit = callPackage ../tools/text/poedit {
- wxGTK30-gtk3 = wxGTK30-gtk3.override { withWebKit = true; };
+ wxGTK30 = wxGTK30.override { withWebKit = true; };
};
polaris = callPackage ../servers/polaris { };
@@ -16703,7 +16703,7 @@ with pkgs;
bloop = callPackage ../development/tools/build-managers/bloop { };
bossa = callPackage ../development/embedded/bossa {
- wxGTK = wxGTK30-gtk3;
+ wxGTK = wxGTK30;
};
bossa-arduino = callPackage ../development/embedded/bossa/arduino.nix { };
@@ -23159,12 +23159,9 @@ with pkgs;
};
wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix {
- withGtk2 = true;
inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;
};
- wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; };
- wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; };
wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix {
inherit (darwin.stubs) derez rez setfile;
@@ -23182,7 +23179,7 @@ with pkgs;
};
wxSVG = callPackage ../development/libraries/wxSVG {
- wxGTK = wxGTK30-gtk3;
+ wxGTK = wxGTK30;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@@ -31755,7 +31752,7 @@ with pkgs;
radioboat = callPackage ../applications/audio/radioboat { };
radiotray-ng = callPackage ../applications/audio/radiotray-ng {
- wxGTK = wxGTK30-gtk3;
+ wxGTK = wxGTK30;
};
raiseorlaunch = callPackage ../applications/misc/raiseorlaunch {};
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 642eb11d674c..e1046319e94a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -389,7 +389,7 @@ let
substituteInPlace Build.PL \
--replace "gtk+-2.0" "gtk+-3.0"
'';
- propagatedBuildInputs = [ pkgs.pkg-config pkgs.gtk3 pkgs.wxGTK30-gtk3 ModulePluggable ];
+ propagatedBuildInputs = [ pkgs.pkg-config pkgs.gtk3 pkgs.wxGTK30 ModulePluggable ];
buildInputs = [ LWPProtocolHttps ];
meta = {
description = "Building, finding and using wxWidgets binaries";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 961746c434bf..e87362ef5f75 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12039,7 +12039,7 @@ self: super: with self; {
wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix {
inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL;
- wxGTK = pkgs.wxGTK30-gtk3.override {
+ wxGTK = pkgs.wxGTK30.override {
withWebKit = true;
};
};