diff --git a/nixos/modules/programs/ccache.nix b/nixos/modules/programs/ccache.nix index c758831c759e..4f6b5259afb9 100644 --- a/nixos/modules/programs/ccache.nix +++ b/nixos/modules/programs/ccache.nix @@ -23,7 +23,7 @@ in description = "Nix top-level packages to be compiled using CCache"; default = [ ]; example = [ - "wxGTK32" + "wxwidgets_3_2" "ffmpeg" "libav_all" ]; diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index abb59307d08e..13d31d066065 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -5,7 +5,7 @@ pkg-config, unzip, portaudio, - wxGTK32, + wxwidgets_3_2, sox, }: @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ portaudio - wxGTK32 + wxwidgets_3_2 ]; # TODO: diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 08f2bf8bc401..1ae9cdb2a8ec 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -42,7 +42,7 @@ sqlite, tinyxml, util-linux, - wxGTK32, + wxwidgets_3_2, libxtst, libxdmcp, xz, @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { rapidjson sqlite tinyxml - wxGTK32 + wxwidgets_3_2 xz ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 4ff9ef72b682..c36c9c9e371a 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -5,7 +5,7 @@ fetchpatch, cmake, sqlite, - wxGTK32, + wxwidgets_3_2, libusb1, soapysdr, mesa_glu, @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { fltk libx11 mesa_glu - wxGTK32 + wxwidgets_3_2 ]; doInstallCheck = true; diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix index 2f6110a33b19..0e9452051f49 100644 --- a/pkgs/by-name/ae/aegisub/package.nix +++ b/pkgs/by-name/ae/aegisub/package.nix @@ -28,7 +28,7 @@ python3, stdenv, wrapGAppsHook3, - wxGTK32, + wxwidgets_3_2, zlib, # Boolean guard flags alsaSupport ? stdenv.hostPlatform.isLinux, @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config python3 - wxGTK32 + wxwidgets_3_2 wrapGAppsHook3 ]; @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { libGL libass libuchardet - wxGTK32 + wxwidgets_3_2 zlib ] ++ lib.optionals alsaSupport [ alsa-lib ] diff --git a/pkgs/by-name/am/amule/package.nix b/pkgs/by-name/am/amule/package.nix index 92704f390d0b..680b56d16165 100644 --- a/pkgs/by-name/am/amule/package.nix +++ b/pkgs/by-name/am/amule/package.nix @@ -10,7 +10,7 @@ lib, cmake, zlib, - wxGTK32, + wxwidgets_3_2, perl, cryptopp, libupnp, @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ zlib - wxGTK32 + wxwidgets_3_2 perl cryptopp.dev libupnp diff --git a/pkgs/by-name/as/asc/package.nix b/pkgs/by-name/as/asc/package.nix index cad2d9710a09..c28bd20cd0ef 100644 --- a/pkgs/by-name/as/asc/package.nix +++ b/pkgs/by-name/as/asc/package.nix @@ -12,7 +12,7 @@ expat, freetype, libjpeg, - wxGTK32, + wxwidgets_3_2, lua, perl, pkg-config, @@ -51,7 +51,7 @@ stdenv.mkDerivation { expat freetype libjpeg - wxGTK32 + wxwidgets_3_2 lua perl zlib diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index 9dd69e2093b0..272310aadca4 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -49,7 +49,7 @@ libxkbcommon, util-linux, wavpack, - wxGTK32, + wxwidgets_3_2, gtk3, libpng, libjpeg, @@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: { twolame portaudio wavpack - wxGTK32 + wxwidgets_3_2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # for portaudio diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix index 90a9dd160407..a4ef61e672d8 100644 --- a/pkgs/by-name/ba/bambu-studio/package.nix +++ b/pkgs/by-name/ba/bambu-studio/package.nix @@ -36,13 +36,13 @@ systemd, onetbb, webkitgtk_4_1, - wxGTK31, + wxwidgets_3_1, libx11, withSystemd ? stdenv.hostPlatform.isLinux, }: let wxGTK' = - (wxGTK31.override { + (wxwidgets_3_1.override { withCurl = true; withPrivateFonts = true; withWebKit = true; diff --git a/pkgs/by-name/bo/bochs/package.nix b/pkgs/by-name/bo/bochs/package.nix index 6b8ff52a4150..d4026a16cfa4 100644 --- a/pkgs/by-name/bo/bochs/package.nix +++ b/pkgs/by-name/bo/bochs/package.nix @@ -16,7 +16,7 @@ readline, stdenv, wget, - wxGTK32, + wxwidgets_3_2, # Boolean flags enableSDL2 ? true, enableTerm ? true, @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableWx [ gtk3 - wxGTK32 + wxwidgets_3_2 ] ++ lib.optionals enableX11 [ libGL diff --git a/pkgs/by-name/bo/boinc/package.nix b/pkgs/by-name/bo/boinc/package.nix index d9c277633124..1b170dfb5137 100644 --- a/pkgs/by-name/bo/boinc/package.nix +++ b/pkgs/by-name/bo/boinc/package.nix @@ -14,7 +14,7 @@ libglut, libjpeg, libtool, - wxGTK32, + wxwidgets_3_2, libxcb-util, sqlite, gtk3, @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { libxi libglut libjpeg - wxGTK32 + wxwidgets_3_2 gtk3 libxscrnsaver libnotify diff --git a/pkgs/by-name/bo/bossa/package.nix b/pkgs/by-name/bo/bossa/package.nix index e1665d6d1ef6..72b7f2a9a18b 100644 --- a/pkgs/by-name/bo/bossa/package.nix +++ b/pkgs/by-name/bo/bossa/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - wxGTK32, + wxwidgets_3_2, libx11, readline, fetchpatch, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ bin2c ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 libx11 readline ]; diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index 912859780604..6d8efb1d6395 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -32,7 +32,7 @@ wayland, wayland-scanner, wrapGAppsHook3, - wxGTK32, + wxwidgets_3_2, zarchive, bluez, }: @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { nasm ninja pkg-config - wxGTK32 + wxwidgets_3_2 wayland-scanner ]; @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { rapidjson vulkan-headers wayland - wxGTK32 + wxwidgets_3_2 zarchive bluez ]; diff --git a/pkgs/by-name/co/codeblocks/package.nix b/pkgs/by-name/co/codeblocks/package.nix index ef647155ab38..f9deb48f9f77 100644 --- a/pkgs/by-name/co/codeblocks/package.nix +++ b/pkgs/by-name/co/codeblocks/package.nix @@ -6,7 +6,7 @@ pkg-config, file, zip, - wxGTK32, + wxwidgets_3_2, gtk3, contribPlugins ? false, hunspell, @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 gtk3 ] ++ lib.optionals contribPlugins [ diff --git a/pkgs/by-name/co/comical/package.nix b/pkgs/by-name/co/comical/package.nix index 12b60ba5c3f9..789288f68988 100644 --- a/pkgs/by-name/co/comical/package.nix +++ b/pkgs/by-name/co/comical/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, hexdump, - wxGTK32, + wxwidgets_3_2, zlib, }: @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 zlib ]; diff --git a/pkgs/by-name/cu/cubicsdr/package.nix b/pkgs/by-name/cu/cubicsdr/package.nix index 45865b47e42b..f7a4e54aab96 100644 --- a/pkgs/by-name/cu/cubicsdr/package.nix +++ b/pkgs/by-name/cu/cubicsdr/package.nix @@ -12,7 +12,7 @@ liquid-dsp, pkg-config, soapysdr-with-plugins, - wxGTK32, + wxwidgets_3_2, enableDigitalLab ? false, }: @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { hamlib liquid-dsp soapysdr-with-plugins - wxGTK32 + wxwidgets_3_2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio diff --git a/pkgs/by-name/da/darkradiant/package.nix b/pkgs/by-name/da/darkradiant/package.nix index 00ca5bd6ee82..25f7f9f17809 100644 --- a/pkgs/by-name/da/darkradiant/package.nix +++ b/pkgs/by-name/da/darkradiant/package.nix @@ -6,7 +6,7 @@ pkg-config, zlib, libjpeg, - wxGTK32, + wxwidgets_3_2, libxml2, libsigcxx, libpng, @@ -41,14 +41,14 @@ stdenv.mkDerivation (finalAttrs: { pkg-config asciidoctor wrapGAppsHook3 - wxGTK32 + wxwidgets_3_2 installShellFiles ]; buildInputs = [ zlib libjpeg - wxGTK32 + wxwidgets_3_2 libxml2 libsigcxx libpng diff --git a/pkgs/by-name/dv/dvdstyler/package.nix b/pkgs/by-name/dv/dvdstyler/package.nix index 23c861c75303..c0eb99d0dbb0 100644 --- a/pkgs/by-name/dv/dvdstyler/package.nix +++ b/pkgs/by-name/dv/dvdstyler/package.nix @@ -18,7 +18,7 @@ libjpeg, pkg-config, wrapGAppsHook3, - wxGTK32, + wxwidgets_3_2, wxsvg, xine-ui, xmlto, @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { libexif libjpeg wxsvg - wxGTK32 + wxwidgets_3_2 xine-ui ] ++ optionals dvdisasterSupport [ dvdisaster ] diff --git a/pkgs/by-name/el/electricsheep/package.nix b/pkgs/by-name/el/electricsheep/package.nix index 41ec4b9f9227..82419173a056 100644 --- a/pkgs/by-name/el/electricsheep/package.nix +++ b/pkgs/by-name/el/electricsheep/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, autoreconfHook, - wxGTK32, + wxwidgets_3_2, ffmpeg, lua5_1, curl, @@ -42,7 +42,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 ffmpeg lua5_1 curl diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix index 84130cbcb7aa..caadde2007af 100644 --- a/pkgs/by-name/es/espanso/package.nix +++ b/pkgs/by-name/es/espanso/package.nix @@ -18,7 +18,7 @@ xdotool, setxkbmap, wl-clipboard, - wxGTK32, + wxwidgets_3_2, makeWrapper, securityWrapperPath ? null, nix-update-script, @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: { extra-cmake-modules pkg-config makeWrapper - wxGTK32 + wxwidgets_3_2 ]; # Ref: https://github.com/espanso/espanso/blob/78df1b704fe2cc5ea26f88fdc443b6ae1df8a989/scripts/build_binary.rs#LL49C3-L62C4 @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ libpng - wxGTK32 + wxwidgets_3_2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl diff --git a/pkgs/by-name/fa/far2l/package.nix b/pkgs/by-name/fa/far2l/package.nix index 764eb5252960..ea771b7d03cd 100644 --- a/pkgs/by-name/fa/far2l/package.nix +++ b/pkgs/by-name/fa/far2l/package.nix @@ -21,7 +21,7 @@ withTTYX ? true, libx11, withGUI ? true, - wxGTK32, + wxwidgets_3_2, withUCD ? true, libuchardet, @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional withTTYX libx11 - ++ lib.optional withGUI wxGTK32 + ++ lib.optional withGUI wxwidgets_3_2 ++ lib.optional withUCD libuchardet ++ lib.optionals withColorer [ spdlog diff --git a/pkgs/by-name/fi/filezilla/package.nix b/pkgs/by-name/fi/filezilla/package.nix index 45c0920272a2..66ba7117e39e 100644 --- a/pkgs/by-name/fi/filezilla/package.nix +++ b/pkgs/by-name/fi/filezilla/package.nix @@ -15,7 +15,7 @@ tinyxml, boost, wrapGAppsHook3, - wxGTK32, + wxwidgets_3_2, gtk3, xdg-utils, }: @@ -52,7 +52,7 @@ stdenv.mkDerivation { pugixml sqlite tinyxml - wxGTK32 + wxwidgets_3_2 gtk3 xdg-utils ]; diff --git a/pkgs/by-name/fi/fityk/package.nix b/pkgs/by-name/fi/fityk/package.nix index 670a46b802b2..49eaf2911318 100644 --- a/pkgs/by-name/fi/fityk/package.nix +++ b/pkgs/by-name/fi/fityk/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, autoreconfHook, - wxGTK32, + wxwidgets_3_2, boost186, lua, zlib, @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { swig ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 boost186 lua zlib @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ]; configureFlags = [ - "--with-wx-config=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}" + "--with-wx-config=${lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config"}" ]; env.NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/by-name/fl/flamerobin/package.nix b/pkgs/by-name/fl/flamerobin/package.nix index 139dbd765ab3..924b04ae060f 100644 --- a/pkgs/by-name/fl/flamerobin/package.nix +++ b/pkgs/by-name/fl/flamerobin/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - wxGTK32, + wxwidgets_3_2, boost, firebird, }: @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 boost firebird ]; diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix index a5d3af69c2d3..99d631b9ad1e 100644 --- a/pkgs/by-name/fr/freedv/package.nix +++ b/pkgs/by-name/fr/freedv/package.nix @@ -20,7 +20,7 @@ portaudio, speexdsp, hamlib_4, - wxGTK32, + wxwidgets_3_2, dbus, apple-sdk_15, nix-update-script, @@ -135,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: { lpcnet speexdsp hamlib_4 - wxGTK32 + wxwidgets_3_2 python3.pkgs.numpy ] ++ ( diff --git a/pkgs/by-name/fr/freqtweak/package.nix b/pkgs/by-name/fr/freqtweak/package.nix index cc2012671fe3..7e28bd00420a 100644 --- a/pkgs/by-name/fr/freqtweak/package.nix +++ b/pkgs/by-name/fr/freqtweak/package.nix @@ -9,7 +9,7 @@ libjack2, libsigcxx, libxml2, - wxGTK32, + wxwidgets_3_2, }: @@ -34,7 +34,7 @@ stdenv.mkDerivation { libjack2 libsigcxx libxml2 - wxGTK32 + wxwidgets_3_2 ]; preConfigure = '' diff --git a/pkgs/by-name/fs/fsg/package.nix b/pkgs/by-name/fs/fsg/package.nix index d99f163a996b..cb53200d534c 100644 --- a/pkgs/by-name/fs/fsg/package.nix +++ b/pkgs/by-name/fs/fsg/package.nix @@ -7,7 +7,7 @@ pkg-config, libGLU, libGL, - wxGTK32, + wxwidgets_3_2, libx11, xorgproto, runtimeShell, @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # use correct wx-config for cross-compiling postPatch = '' substituteInPlace makefile \ - --replace-fail 'wx-config' "${lib.getExe' wxGTK32 "wx-config"}" + --replace-fail 'wx-config' "${lib.getExe' wxwidgets_3_2 "wx-config"}" ''; hardeningDisable = [ "format" ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { glib libGLU libGL - wxGTK32 + wxwidgets_3_2 libx11 xorgproto ]; diff --git a/pkgs/by-name/ga/gambit-project/package.nix b/pkgs/by-name/ga/gambit-project/package.nix index 80cfcce53714..deee39bcd247 100644 --- a/pkgs/by-name/ga/gambit-project/package.nix +++ b/pkgs/by-name/ga/gambit-project/package.nix @@ -3,7 +3,7 @@ autoreconfHook, fetchFromGitHub, stdenv, - wxGTK31, + wxwidgets_3_1, withGui ? true, }: @@ -18,9 +18,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-xoFtqPUC/qLrlEewIPeDmOH7rWMB+ak5CdVlH5t84MY="; }; - nativeBuildInputs = [ autoreconfHook ] ++ lib.optional withGui wxGTK31; + nativeBuildInputs = [ autoreconfHook ] ++ lib.optional withGui wxwidgets_3_1; - buildInputs = lib.optional withGui wxGTK31; + buildInputs = lib.optional withGui wxwidgets_3_1; strictDeps = true; diff --git a/pkgs/by-name/go/golly/package.nix b/pkgs/by-name/go/golly/package.nix index e6b1c27668c1..b694632a2853 100644 --- a/pkgs/by-name/go/golly/package.nix +++ b/pkgs/by-name/go/golly/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, wrapGAppsHook3, - wxGTK32, + wxwidgets_3_2, python3, zlib, libGLU, @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ - wxGTK32 + wxwidgets_3_2 python3 zlib libGLU @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { "CXX=${stdenv.cc.targetPrefix}c++" "CXXC=${stdenv.cc.targetPrefix}c++" "LD=${stdenv.cc.targetPrefix}c++" - "WX_CONFIG=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}" + "WX_CONFIG=${lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config"}" ]; installPhase = '' diff --git a/pkgs/by-name/gr/grandorgue/package.nix b/pkgs/by-name/gr/grandorgue/package.nix index f599a2f592fa..16dc89c16c76 100644 --- a/pkgs/by-name/gr/grandorgue/package.nix +++ b/pkgs/by-name/gr/grandorgue/package.nix @@ -9,7 +9,7 @@ alsa-lib, zlib, wavpack, - wxGTK32, + wxwidgets_3_2, udev, jackaudioSupport ? false, libjack2, @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { fftwFloat zlib wavpack - wxGTK32 + wxwidgets_3_2 yaml-cpp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/gr/grass/package.nix b/pkgs/by-name/gr/grass/package.nix index 97b23458ce7a..d0e064be74d4 100644 --- a/pkgs/by-name/gr/grass/package.nix +++ b/pkgs/by-name/gr/grass/package.nix @@ -33,7 +33,7 @@ python3Packages, readline, sqlite, - wxGTK32, + wxwidgets_3_2, zlib, zstd, }: @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { proj readline sqlite - wxGTK32 + wxwidgets_3_2 zlib zstd ] diff --git a/pkgs/by-name/hu/hugin/package.nix b/pkgs/by-name/hu/hugin/package.nix index 053b9c7f8f83..9d3bf5f3f330 100644 --- a/pkgs/by-name/hu/hugin/package.nix +++ b/pkgs/by-name/hu/hugin/package.nix @@ -30,8 +30,8 @@ sqlite, vigra, wrapGAppsHook3, - wxGTK32, - wxGTK' ? wxGTK32, + wxwidgets_3_2, + wxGTK' ? wxwidgets_3_2, zlib, }: diff --git a/pkgs/by-name/ki/kicad/package.nix b/pkgs/by-name/ki/kicad/package.nix index 11e14c5d7ed7..60218a56b109 100644 --- a/pkgs/by-name/ki/kicad/package.nix +++ b/pkgs/by-name/ki/kicad/package.nix @@ -12,7 +12,7 @@ adwaita-icon-theme, dconf, gtk3, - wxGTK32, + wxwidgets_3_2, librsvg, cups, gsettings-desktop-schemas, @@ -134,7 +134,7 @@ let else versionsImport.${baseName}.libVersion.version; - wxGTK = wxGTK32; + wxGTK = wxwidgets_3_2; python = python3; wxPython = python.pkgs.wxpython; addonPath = "addon.zip"; diff --git a/pkgs/by-name/le/lenmus/package.nix b/pkgs/by-name/le/lenmus/package.nix index 076eb9501d88..745f08915694 100644 --- a/pkgs/by-name/le/lenmus/package.nix +++ b/pkgs/by-name/le/lenmus/package.nix @@ -13,7 +13,7 @@ libpng, pngpp, zlib, - wxGTK32, + wxwidgets_3_2, wxsqlite3, fluidsynth, fontconfig, @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { libpng pngpp zlib - wxGTK32 + wxwidgets_3_2 wxsqlite3 fluidsynth fontconfig diff --git a/pkgs/by-name/me/mediainfo-gui/package.nix b/pkgs/by-name/me/mediainfo-gui/package.nix index 878c491e45ee..a5d7caaecea4 100644 --- a/pkgs/by-name/me/mediainfo-gui/package.nix +++ b/pkgs/by-name/me/mediainfo-gui/package.nix @@ -5,7 +5,7 @@ autoreconfHook, pkg-config, libmediainfo, - wxGTK32, + wxwidgets_3_2, desktop-file-utils, libsm, imagemagick, @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libmediainfo - wxGTK32 + wxwidgets_3_2 desktop-file-utils libsm imagemagick diff --git a/pkgs/by-name/me/megaglest/package.nix b/pkgs/by-name/me/megaglest/package.nix index d4ff02faf708..27ed4c25f9f4 100644 --- a/pkgs/by-name/me/megaglest/package.nix +++ b/pkgs/by-name/me/megaglest/package.nix @@ -11,7 +11,7 @@ lua, libvlc, libjpeg, - wxGTK32, + wxwidgets_3_2, cppunit, ftgl, glew, @@ -57,7 +57,7 @@ let stdenv.cc.cc glew libGLU - wxGTK32 + wxwidgets_3_2 ]; }; path-env = buildEnv { @@ -127,7 +127,7 @@ stdenv.mkDerivation { libpng libjpeg libvlc - wxGTK32 + wxwidgets_3_2 glib cppunit fontconfig diff --git a/pkgs/by-name/mm/mmex/package.nix b/pkgs/by-name/mm/mmex/package.nix index 4c7d3ec3fe2c..5dde256cfdb9 100644 --- a/pkgs/by-name/mm/mmex/package.nix +++ b/pkgs/by-name/mm/mmex/package.nix @@ -12,7 +12,7 @@ wrapGAppsHook3, curl, sqlite, - wxGTK32, + wxwidgets_3_2, gtk3, lua, wxsqlite3, @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper pkg-config wrapGAppsHook3 - wxGTK32 + wxwidgets_3_2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lsb-release @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl sqlite - wxGTK32 + wxwidgets_3_2 gtk3 lua wxsqlite3 diff --git a/pkgs/by-name/mu/multivnc/package.nix b/pkgs/by-name/mu/multivnc/package.nix index 8428293895d8..fd2da3a2cafb 100644 --- a/pkgs/by-name/mu/multivnc/package.nix +++ b/pkgs/by-name/mu/multivnc/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, fetchpatch, - wxGTK32, + wxwidgets_3_2, gtk3, zlib, libjpeg, @@ -69,7 +69,7 @@ stdenv.mkDerivation { buildInputs = [ gtk3 - wxGTK32 + wxwidgets_3_2 zlib libjpeg libvncserver-patched diff --git a/pkgs/by-name/od/odamex/package.nix b/pkgs/by-name/od/odamex/package.nix index 8811c7ce19ac..cb9669d79184 100644 --- a/pkgs/by-name/od/odamex/package.nix +++ b/pkgs/by-name/od/odamex/package.nix @@ -30,7 +30,7 @@ portmidi, wayland-scanner, waylandpp, - wxGTK32, + wxwidgets_3_2, libx11, xorgproto, zstd, @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { libsysprof-capture pcre2 portmidi - wxGTK32 + wxwidgets_3_2 zstd ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 25240b2c63a2..37268f2bb356 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -37,14 +37,14 @@ systemd, onetbb, webkitgtk_4_1, - wxGTK31, + wxwidgets_3_1, libx11, libnoise, withSystemd ? stdenv.hostPlatform.isLinux, }: let wxGTK' = - (wxGTK31.override { + (wxwidgets_3_1.override { withCurl = true; withPrivateFonts = true; withWebKit = true; diff --git a/pkgs/by-name/pc/pcem/package.nix b/pkgs/by-name/pc/pcem/package.nix index 65e7aec32009..5d4980d1eaf5 100644 --- a/pkgs/by-name/pc/pcem/package.nix +++ b/pkgs/by-name/pc/pcem/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchzip, - wxGTK32, + wxwidgets_3_2, coreutils, SDL2, openal, @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook3 ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 coreutils SDL2 openal diff --git a/pkgs/by-name/ph/phd2/package.nix b/pkgs/by-name/ph/phd2/package.nix index 75d1fabb98de..0d0c3aa74fa4 100644 --- a/pkgs/by-name/ph/phd2/package.nix +++ b/pkgs/by-name/ph/phd2/package.nix @@ -16,7 +16,7 @@ gtk3, libnova, libusb1, - wxGTK32, + wxwidgets_3_2, }: stdenv.mkDerivation (finalAttrs: { @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 libnova libusb1 - wxGTK32 + wxwidgets_3_2 ]; cmakeFlags = [ diff --git a/pkgs/by-name/pl/plplot/package.nix b/pkgs/by-name/pl/plplot/package.nix index 5534fb0bc6d2..f4584b101e31 100644 --- a/pkgs/by-name/pl/plplot/package.nix +++ b/pkgs/by-name/pl/plplot/package.nix @@ -5,7 +5,7 @@ cmake, pkg-config, enableWX ? false, - wxGTK32, + wxwidgets_3_2, enableXWin ? false, libx11, enablePNG ? false, @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = - lib.optional enableWX wxGTK32 + lib.optional enableWX wxwidgets_3_2 ++ lib.optional enableXWin libx11 ++ lib.optionals enablePNG [ cairo diff --git a/pkgs/by-name/po/poedit/package.nix b/pkgs/by-name/po/poedit/package.nix index 29a207cc5ba3..f7522b1e1495 100644 --- a/pkgs/by-name/po/poedit/package.nix +++ b/pkgs/by-name/po/poedit/package.nix @@ -7,7 +7,7 @@ libtool, gettext, pkg-config, - wxGTK32, + wxwidgets_3_2, boost, icu, lucenepp, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ lucenepp nlohmann_json - wxGTK32 + wxwidgets_3_2 icu pugixml gtk3 diff --git a/pkgs/by-name/pr/prusa-slicer/package.nix b/pkgs/by-name/pr/prusa-slicer/package.nix index 7b3436da5be5..ef23c31a461b 100644 --- a/pkgs/by-name/pr/prusa-slicer/package.nix +++ b/pkgs/by-name/pr/prusa-slicer/package.nix @@ -29,7 +29,7 @@ openvdb, qhull, onetbb, - wxGTK32, + wxwidgets_3_2, libx11, libbgcode, heatshrink, @@ -56,7 +56,7 @@ let hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY="; }; }); - wxGTK-override' = if wxGTK-override == null then wxGTK32 else wxGTK-override; + wxGTK-override' = if wxGTK-override == null then wxwidgets_3_2 else wxGTK-override; opencascade-override' = if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override; in diff --git a/pkgs/by-name/pt/pterm/package.nix b/pkgs/by-name/pt/pterm/package.nix index 675ae8a5934a..c7f3639f6075 100644 --- a/pkgs/by-name/pt/pterm/package.nix +++ b/pkgs/by-name/pt/pterm/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, libsndfile, - wxGTK32, + wxwidgets_3_2, SDL, }: @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libsndfile SDL - wxGTK32 + wxwidgets_3_2 ]; src = fetchurl { diff --git a/pkgs/by-name/pw/pwsafe/package.nix b/pkgs/by-name/pw/pwsafe/package.nix index dedc0249bba7..1550d70dc40f 100644 --- a/pkgs/by-name/pw/pwsafe/package.nix +++ b/pkgs/by-name/pw/pwsafe/package.nix @@ -7,7 +7,7 @@ zip, gettext, perl, - wxGTK32, + wxwidgets_3_2, libxext, libxi, libxt, @@ -41,12 +41,12 @@ stdenv.mkDerivation (finalAttrs: { gettext perl pkg-config - wxGTK32 + wxwidgets_3_2 zip ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 curl qrencode openssl diff --git a/pkgs/by-name/ra/radiotray-ng/package.nix b/pkgs/by-name/ra/radiotray-ng/package.nix index f844a04d46c3..10195ae3446e 100644 --- a/pkgs/by-name/ra/radiotray-ng/package.nix +++ b/pkgs/by-name/ra/radiotray-ng/package.nix @@ -18,7 +18,7 @@ libappindicator-gtk3, libnotify, libxdg_basedir, - wxGTK32, + wxwidgets_3_2, # GStreamer glib-networking, gst_all_1, @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { libnotify libxdg_basedir lsb-release - wxGTK32 + wxwidgets_3_2 # for https gstreamer / libsoup glib-networking ] diff --git a/pkgs/by-name/ra/rapidsvn/package.nix b/pkgs/by-name/ra/rapidsvn/package.nix index abbaeca4ef56..99bf1dafc63e 100644 --- a/pkgs/by-name/ra/rapidsvn/package.nix +++ b/pkgs/by-name/ra/rapidsvn/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, autoreconfHook, - wxGTK32, + wxwidgets_3_2, subversion, apr, aprutil, @@ -31,7 +31,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 subversion apr aprutil diff --git a/pkgs/by-name/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix index dbbbc6971899..1aa827713c19 100644 --- a/pkgs/by-name/re/rehex/package.nix +++ b/pkgs/by-name/re/rehex/package.nix @@ -10,7 +10,7 @@ capstone, jansson, libunistring, - wxGTK32, + wxwidgets_3_2, lua53Packages, perlPackages, gtk3, @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { capstone jansson libunistring - wxGTK32 + wxwidgets_3_2 ] ++ (with lua53Packages; [ lua diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 7d105488af7f..a95fc1b5935b 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -30,7 +30,7 @@ proj, qhull, vigra, - wxGTK32, + wxwidgets_3_2, xz, # darwin-specific netcdf, @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { proj qhull vigra - wxGTK32 + wxwidgets_3_2 xz ] ++ lib.optionals cudaSupport [ diff --git a/pkgs/by-name/sc/scorched3d/package.nix b/pkgs/by-name/sc/scorched3d/package.nix index d2669a36eb24..7608ac82e937 100644 --- a/pkgs/by-name/sc/scorched3d/package.nix +++ b/pkgs/by-name/sc/scorched3d/package.nix @@ -8,7 +8,7 @@ pkg-config, openal-soft, freealut, - wxGTK32, + wxwidgets_3_2, libogg, freetype, libvorbis, @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { glew openal-soft freealut - wxGTK32 + wxwidgets_3_2 libogg freetype libvorbis diff --git a/pkgs/by-name/sl/slade-unstable/package.nix b/pkgs/by-name/sl/slade-unstable/package.nix index 14eebfe9310e..4381f91192ce 100644 --- a/pkgs/by-name/sl/slade-unstable/package.nix +++ b/pkgs/by-name/sl/slade-unstable/package.nix @@ -6,7 +6,7 @@ pkg-config, which, zip, - wxGTK32, + wxwidgets_3_2, gtk3, sfml_2, fluidsynth, @@ -40,7 +40,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 gtk3 sfml_2 fluidsynth @@ -53,8 +53,8 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DwxWidgets_LIBRARIES=${wxGTK32}/lib" - (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxGTK32) "wx-config")) + "-DwxWidgets_LIBRARIES=${wxwidgets_3_2}/lib" + (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config")) ]; env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; diff --git a/pkgs/by-name/sl/slade/package.nix b/pkgs/by-name/sl/slade/package.nix index c8ae877a1c0a..1e3d861d0f93 100644 --- a/pkgs/by-name/sl/slade/package.nix +++ b/pkgs/by-name/sl/slade/package.nix @@ -6,7 +6,7 @@ pkg-config, which, zip, - wxGTK32, + wxwidgets_3_2, gtk3, sfml_2, fluidsynth, @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 gtk3 sfml_2 fluidsynth @@ -52,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DwxWidgets_LIBRARIES=${wxGTK32}/lib" - (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxGTK32) "wx-config")) + "-DwxWidgets_LIBRARIES=${wxwidgets_3_2}/lib" + (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config")) ]; env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; diff --git a/pkgs/by-name/so/sooperlooper/package.nix b/pkgs/by-name/so/sooperlooper/package.nix index 0644d475067a..78b2aa4baa32 100644 --- a/pkgs/by-name/so/sooperlooper/package.nix +++ b/pkgs/by-name/so/sooperlooper/package.nix @@ -10,7 +10,7 @@ libxml2, libjack2, libsndfile, - wxGTK32, + wxwidgets_3_2, libsigcxx, libsamplerate, rubberband, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 libjack2 libsndfile - wxGTK32 + wxwidgets_3_2 libsigcxx libsamplerate rubberband diff --git a/pkgs/by-name/so/sound-of-sorting/package.nix b/pkgs/by-name/so/sound-of-sorting/package.nix index 4f01b6a418cb..fcee0754c92e 100644 --- a/pkgs/by-name/so/sound-of-sorting/package.nix +++ b/pkgs/by-name/so/sound-of-sorting/package.nix @@ -5,7 +5,7 @@ fetchpatch, pkg-config, SDL2, - wxGTK32, + wxwidgets_3_2, }: stdenv.mkDerivation (finalAttrs: { @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 SDL2 ]; diff --git a/pkgs/by-name/sp/spatialite-gui/package.nix b/pkgs/by-name/sp/spatialite-gui/package.nix index 42ec69fcee55..9a74ecc00beb 100644 --- a/pkgs/by-name/sp/spatialite-gui/package.nix +++ b/pkgs/by-name/sp/spatialite-gui/package.nix @@ -20,7 +20,7 @@ proj, sqlite, virtualpg, - wxGTK32, + wxwidgets_3_2, xz, zstd, }: @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { proj sqlite virtualpg - wxGTK32 + wxwidgets_3_2 xz zstd ]; diff --git a/pkgs/by-name/sp/spek/package.nix b/pkgs/by-name/sp/spek/package.nix index 1abbb0b2a2d8..735242cd96f4 100644 --- a/pkgs/by-name/sp/spek/package.nix +++ b/pkgs/by-name/sp/spek/package.nix @@ -6,7 +6,7 @@ intltool, pkg-config, ffmpeg, - wxGTK32, + wxwidgets_3_2, gtk3, wrapGAppsHook3, }: @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ ffmpeg - wxGTK32 + wxwidgets_3_2 gtk3 ]; diff --git a/pkgs/by-name/su/super-slicer/package.nix b/pkgs/by-name/su/super-slicer/package.nix index d5207b2cfe36..5f14f172aa4b 100644 --- a/pkgs/by-name/su/super-slicer/package.nix +++ b/pkgs/by-name/su/super-slicer/package.nix @@ -3,7 +3,7 @@ fetchFromGitHub, fetchpatch, makeDesktopItem, - wxGTK31, + wxwidgets_3_1, prusa-slicer, libspnav, opencascade-occt_7_6, @@ -23,7 +23,7 @@ let ./super-slicer-fix-cereal-1.3.1.patch ]; - wxGTK31-prusa = wxGTK31.overrideAttrs (old: { + wxwidgets_3_1-prusa = wxwidgets_3_1.overrideAttrs (old: { pname = "wxwidgets-prusa3d-patched"; version = "3.1.4"; src = fetchFromGitHub { @@ -44,7 +44,7 @@ let hash = "sha256-FkoGcgVoBeHSZC3W5y30TBPmPrWnZSlO66TgwskgqAU="; inherit patches; overrides = { - wxGTK-override = wxGTK31-prusa; + wxGTK-override = wxwidgets_3_1-prusa; }; }; latest = { @@ -52,7 +52,7 @@ let hash = "sha256-FkoGcgVoBeHSZC3W5y30TBPmPrWnZSlO66TgwskgqAU="; inherit patches; overrides = { - wxGTK-override = wxGTK31-prusa; + wxGTK-override = wxwidgets_3_1-prusa; }; }; beta = { diff --git a/pkgs/by-name/su/survex/package.nix b/pkgs/by-name/su/survex/package.nix index d0bc1af7736b..88641fe1357e 100644 --- a/pkgs/by-name/su/survex/package.nix +++ b/pkgs/by-name/su/survex/package.nix @@ -14,7 +14,7 @@ gdal, python3, wrapGAppsHook3, - wxGTK32, + wxwidgets_3_2, }: stdenv.mkDerivation (finalAttrs: { @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { glib proj gdal - wxGTK32 + wxwidgets_3_2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # TODO: libGLU doesn't build for macOS because of Mesa issues @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ''; configureFlags = [ - "WX_CONFIG=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}" + "WX_CONFIG=${lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config"}" ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/te/tenacity/package.nix b/pkgs/by-name/te/tenacity/package.nix index eefa424ddbdf..085c68528982 100644 --- a/pkgs/by-name/te/tenacity/package.nix +++ b/pkgs/by-name/te/tenacity/package.nix @@ -4,7 +4,7 @@ fetchFromCodeberg, cmake, ninja, - wxGTK32, + wxwidgets_3_2, gtk3, pkg-config, python3, @@ -160,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: { sratom suil twolame - wxGTK32 + wxwidgets_3_2 gtk3 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/th/therion/package.nix b/pkgs/by-name/th/therion/package.nix index 09e6cef875c6..b143aef21a8f 100644 --- a/pkgs/by-name/th/therion/package.nix +++ b/pkgs/by-name/th/therion/package.nix @@ -15,7 +15,7 @@ makeWrapper, fmt, proj, - wxGTK32, + wxwidgets_3_2, vtk, freetype, libjpeg, @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { expat tclPackages.tkimg proj - wxGTK32 + wxwidgets_3_2 vtk tk freetype diff --git a/pkgs/by-name/tq/tqsl/package.nix b/pkgs/by-name/tq/tqsl/package.nix index 16879752daa8..35122d3d64ba 100644 --- a/pkgs/by-name/tq/tqsl/package.nix +++ b/pkgs/by-name/tq/tqsl/package.nix @@ -9,7 +9,7 @@ lmdb, curl, sqlite, - wxGTK32, + wxwidgets_3_2, wrapGAppsHook3, }: @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { lmdb curl sqlite - wxGTK32 + wxwidgets_3_2 ]; meta = { diff --git a/pkgs/by-name/tr/treesheets/package.nix b/pkgs/by-name/tr/treesheets/package.nix index 5aee8c97e650..06dd3e81be74 100644 --- a/pkgs/by-name/tr/treesheets/package.nix +++ b/pkgs/by-name/tr/treesheets/package.nix @@ -6,7 +6,7 @@ ninja, wrapGAppsHook3, makeWrapper, - wxGTK32, + wxwidgets_3_2, unstableGitUpdater, }: @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 ]; env.NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${ diff --git a/pkgs/by-name/uc/ucblogo/package.nix b/pkgs/by-name/uc/ucblogo/package.nix index d4cb1520e63c..53c2893ccfc9 100644 --- a/pkgs/by-name/uc/ucblogo/package.nix +++ b/pkgs/by-name/uc/ucblogo/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - wxGTK32, + wxwidgets_3_2, texinfo, tetex, wrapGAppsHook3, @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 ]; meta = { diff --git a/pkgs/by-name/ur/urbackup-client/package.nix b/pkgs/by-name/ur/urbackup-client/package.nix index 50d92d94ad87..221048d48ffa 100644 --- a/pkgs/by-name/ur/urbackup-client/package.nix +++ b/pkgs/by-name/ur/urbackup-client/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchzip, - wxGTK32, + wxwidgets_3_2, zlib, zstd, }: @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { ''; buildInputs = [ - wxGTK32 + wxwidgets_3_2 zlib zstd ]; diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index b069bca8eac8..5f15f39bac8d 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -11,7 +11,7 @@ imagemagick, runCommand, libgcc, - wxGTK32, + wxwidgets_3_2, libGL, SDL2, openal, @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libgcc - wxGTK32 + wxwidgets_3_2 SDL2 libGL openal diff --git a/pkgs/by-name/vb/vbam/package.nix b/pkgs/by-name/vb/vbam/package.nix index d884d63dc604..03bbc75945a7 100644 --- a/pkgs/by-name/vb/vbam/package.nix +++ b/pkgs/by-name/vb/vbam/package.nix @@ -6,7 +6,7 @@ fetchFromGitHub, ffmpeg_7, gettext, - wxGTK32, + wxwidgets_3_2, gtk3, libGLU, libGL, @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { sfml_2 zip zlib - wxGTK32 + wxwidgets_3_2 gtk3 gsettings-desktop-schemas ]; diff --git a/pkgs/by-name/ve/veracrypt/package.nix b/pkgs/by-name/ve/veracrypt/package.nix index d4d749b6645e..d55219ecf251 100644 --- a/pkgs/by-name/ve/veracrypt/package.nix +++ b/pkgs/by-name/ve/veracrypt/package.nix @@ -6,7 +6,7 @@ makeself, yasm, fuse, - wxGTK32, + wxwidgets_3_2, lvm2, replaceVars, e2fsprogs, @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ fuse lvm2 - wxGTK32 + wxwidgets_3_2 pcsclite ]; diff --git a/pkgs/by-name/wx/wxc/package.nix b/pkgs/by-name/wx/wxc/package.nix index 9628cc8ed501..a92535a62926 100644 --- a/pkgs/by-name/wx/wxc/package.nix +++ b/pkgs/by-name/wx/wxc/package.nix @@ -4,7 +4,7 @@ fetchFromCodeberg, cmake, libGL, - wxGTK32, + wxwidgets_3_2, }: stdenv.mkDerivation (finalAttrs: { @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - wxGTK32 # in nativeBuildInputs because of wx-config + wxwidgets_3_2 # in nativeBuildInputs because of wx-config ]; buildInputs = [ @@ -41,6 +41,6 @@ stdenv.mkDerivation (finalAttrs: { wxWindowsException31 ]; maintainers = with lib.maintainers; [ fgaz ]; - platforms = wxGTK32.meta.platforms; + platforms = wxwidgets_3_2.meta.platforms; }; }) diff --git a/pkgs/by-name/wx/wxformbuilder/package.nix b/pkgs/by-name/wx/wxformbuilder/package.nix index 3bda111dc931..bb23475919f7 100644 --- a/pkgs/by-name/wx/wxformbuilder/package.nix +++ b/pkgs/by-name/wx/wxformbuilder/package.nix @@ -7,7 +7,7 @@ makeWrapper, shared-mime-info, boost, - wxGTK32, + wxwidgets_3_2, }: stdenv.mkDerivation (finalAttrs: { @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost - wxGTK32 + wxwidgets_3_2 ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/wx/wxhexeditor/package.nix b/pkgs/by-name/wx/wxhexeditor/package.nix index 66d705ab90f1..a8ae91e8debc 100644 --- a/pkgs/by-name/wx/wxhexeditor/package.nix +++ b/pkgs/by-name/wx/wxhexeditor/package.nix @@ -8,7 +8,7 @@ gettext, libtool, python3, - wxGTK32, + wxwidgets_3_2, wrapGAppsHook3, llvmPackages, }: @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { gettext libtool python3 - wxGTK32 + wxwidgets_3_2 wrapGAppsHook3 ]; diff --git a/pkgs/by-name/wx/wxmacmolplt/package.nix b/pkgs/by-name/wx/wxmacmolplt/package.nix index 4629193946c9..bbd76bd3b89f 100644 --- a/pkgs/by-name/wx/wxmacmolplt/package.nix +++ b/pkgs/by-name/wx/wxmacmolplt/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitHub, - wxGTK32, + wxwidgets_3_2, libGL, libGLU, pkg-config, @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 libGL libGLU libx11 diff --git a/pkgs/by-name/wx/wxsqlite3/package.nix b/pkgs/by-name/wx/wxsqlite3/package.nix index 18da48b8af14..da7760010b34 100644 --- a/pkgs/by-name/wx/wxsqlite3/package.nix +++ b/pkgs/by-name/wx/wxsqlite3/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, autoreconfHook, - wxGTK32, + wxwidgets_3_2, sqlite, }: @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ sqlite - wxGTK32 + wxwidgets_3_2 ]; doCheck = true; diff --git a/pkgs/by-name/wx/wxsqliteplus/package.nix b/pkgs/by-name/wx/wxsqliteplus/package.nix index 9fcd3ab13e72..4f7dad29104d 100644 --- a/pkgs/by-name/wx/wxsqliteplus/package.nix +++ b/pkgs/by-name/wx/wxsqliteplus/package.nix @@ -5,7 +5,7 @@ cmake, pkg-config, makeWrapper, - wxGTK32, + wxwidgets_3_2, wxsqlite3, sqlite, }: @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 wxsqlite3 sqlite ]; diff --git a/pkgs/by-name/wx/wxsvg/package.nix b/pkgs/by-name/wx/wxsvg/package.nix index 7897c22e7935..848622de65ba 100644 --- a/pkgs/by-name/wx/wxsvg/package.nix +++ b/pkgs/by-name/wx/wxsvg/package.nix @@ -8,7 +8,7 @@ libexif, pango, pkg-config, - wxGTK32, + wxwidgets_3_2, }: stdenv.mkDerivation (finalAttrs: { @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg libexif pango - wxGTK32 + wxwidgets_3_2 ]; enableParallelBuilding = true; @@ -51,6 +51,6 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; maintainers = [ ]; - inherit (wxGTK32.meta) platforms; + inherit (wxwidgets_3_2.meta) platforms; }; }) diff --git a/pkgs/by-name/wx/wxGTK31/0001-fix-assertion-using-hide-in-destroy.patch b/pkgs/by-name/wx/wxwidgets_3_1/0001-fix-assertion-using-hide-in-destroy.patch similarity index 100% rename from pkgs/by-name/wx/wxGTK31/0001-fix-assertion-using-hide-in-destroy.patch rename to pkgs/by-name/wx/wxwidgets_3_1/0001-fix-assertion-using-hide-in-destroy.patch diff --git a/pkgs/by-name/wx/wxGTK31/0002-support-webkitgtk-41.patch b/pkgs/by-name/wx/wxwidgets_3_1/0002-support-webkitgtk-41.patch similarity index 100% rename from pkgs/by-name/wx/wxGTK31/0002-support-webkitgtk-41.patch rename to pkgs/by-name/wx/wxwidgets_3_1/0002-support-webkitgtk-41.patch diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxwidgets_3_1/package.nix similarity index 100% rename from pkgs/by-name/wx/wxGTK31/package.nix rename to pkgs/by-name/wx/wxwidgets_3_1/package.nix diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxwidgets_3_2/package.nix similarity index 100% rename from pkgs/by-name/wx/wxGTK32/package.nix rename to pkgs/by-name/wx/wxwidgets_3_2/package.nix diff --git a/pkgs/by-name/xc/xchm/package.nix b/pkgs/by-name/xc/xchm/package.nix index 679c8785d59b..449e266a34ff 100644 --- a/pkgs/by-name/xc/xchm/package.nix +++ b/pkgs/by-name/xc/xchm/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, autoreconfHook, - wxGTK32, + wxwidgets_3_2, chmlib, desktopToDarwinBundle, }: @@ -27,14 +27,14 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 chmlib ]; - configureFlags = [ "--with-wx-prefix=${wxGTK32}" ]; + configureFlags = [ "--with-wx-prefix=${wxwidgets_3_2}" ]; preConfigure = '' - export LDFLAGS="$LDFLAGS $(${wxGTK32}/bin/wx-config --libs std,aui | sed -e s@-pthread@@)" + export LDFLAGS="$LDFLAGS $(${wxwidgets_3_2}/bin/wx-config --libs std,aui | sed -e s@-pthread@@)" ''; meta = { diff --git a/pkgs/by-name/xm/xmlcopyeditor/package.nix b/pkgs/by-name/xm/xmlcopyeditor/package.nix index 156b444867e7..5542d144efa2 100644 --- a/pkgs/by-name/xm/xmlcopyeditor/package.nix +++ b/pkgs/by-name/xm/xmlcopyeditor/package.nix @@ -10,7 +10,7 @@ libxml2, libxslt, pcre2, - wxGTK32, + wxwidgets_3_2, xercesc, }: @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 libxslt pcre2 - wxGTK32 + wxwidgets_3_2 xercesc ]; diff --git a/pkgs/by-name/xy/xylib/package.nix b/pkgs/by-name/xy/xylib/package.nix index 563dfff3b320..b62ae98ea8e9 100644 --- a/pkgs/by-name/xy/xylib/package.nix +++ b/pkgs/by-name/xy/xylib/package.nix @@ -5,7 +5,7 @@ boost, zlib, bzip2, - wxGTK32, + wxwidgets_3_2, }: stdenv.mkDerivation (finalAttrs: { @@ -21,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { boost zlib bzip2 - wxGTK32 + wxwidgets_3_2 ]; configureFlags = [ - "--with-wx-config=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}" + "--with-wx-config=${lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config"}" ]; meta = { diff --git a/pkgs/by-name/ze/zeroad-unwrapped/package.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix index 6e4a62bbbb37..f0b49dd9b49d 100644 --- a/pkgs/by-name/ze/zeroad-unwrapped/package.nix +++ b/pkgs/by-name/ze/zeroad-unwrapped/package.nix @@ -34,7 +34,7 @@ cxxtest, freetype, withEditor ? true, - wxGTK32, + wxwidgets_3_2, }: # You can find more instructions on how to build 0ad here: @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { premake5 cxxtest ] - ++ lib.optional withEditor wxGTK32; + ++ lib.optional withEditor wxwidgets_3_2; env.NIX_CFLAGS_COMPILE = toString [ "-I${xorgproto}/include" diff --git a/pkgs/by-name/zo/zod/package.nix b/pkgs/by-name/zo/zod/package.nix index 2626a6d18a34..161bf682b19e 100644 --- a/pkgs/by-name/zo/zod/package.nix +++ b/pkgs/by-name/zo/zod/package.nix @@ -8,7 +8,7 @@ SDL_ttf, SDL_mixer, libmysqlclient, - wxGTK32, + wxwidgets_3_2, symlinkJoin, runCommandLocal, makeWrapper, @@ -35,7 +35,7 @@ let SDL_ttf SDL_mixer libmysqlclient - wxGTK32 + wxwidgets_3_2 coreutils ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2e0aee58aa7b..ad945875cfb8 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -628,8 +628,8 @@ builtins.intersectAttrs super { # wxc supports wxGTX >= 3.0, but our current default version points to 2.8. # http://hydra.cryp.to/build/1331287/log/raw - wxc = (addBuildDepend self.split super.wxc).override { wxGTK = pkgs.wxGTK32; }; - wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK32; }; + wxc = (addBuildDepend self.split super.wxc).override { wxGTK = pkgs.wxwidgets_3_2; }; + wxcore = super.wxcore.override { wxGTK = pkgs.wxwidgets_3_2; }; shellify = enableSeparateBinOutput super.shellify; specup = enableSeparateBinOutput super.specup; diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 5d6b0f3eb699..de761f5be030 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -40,7 +40,7 @@ systemd, unixODBC, wrapGAppsHook3, - wxGTK32, + wxwidgets_3_2, libx11, zlib, }: @@ -53,12 +53,12 @@ let wxPackages2 = if stdenv.hostPlatform.isDarwin then - [ wxGTK32 ] + [ wxwidgets_3_2 ] else [ libGL libGLU - wxGTK32 + wxwidgets_3_2 libx11 wrapGAppsHook3 ]; diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix index ce3d127517ae..2b0d720c7df7 100644 --- a/pkgs/development/interpreters/gnudatalanguage/default.nix +++ b/pkgs/development/interpreters/gnudatalanguage/default.nix @@ -60,7 +60,7 @@ # wxWidgets is preferred over X11 for this project but we only have it on Linux # and Darwin. enableWX ? (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), - wxGTK32, + wxwidgets_3_2, # X11: OFF by default for platform consistency. Use X where WX is not available enableXWin ? (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin), }: @@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional enableXWin plplot-with-drivers.libx11 ++ lib.optional enableGRIB eccodes ++ lib.optional enableGLPK glpk - ++ lib.optional enableWX wxGTK32 + ++ lib.optional enableWX wxwidgets_3_2 ++ lib.optional enableMPI mpi ++ lib.optional enableLibtirpc hdf4-custom.libtirpc ++ lib.optional enableSzip szip; diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 3b5fe45441b0..8c4d7ac369f7 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, cmake, - wxGTK32, + wxwidgets_3_2, openal, pkg-config, curl, @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeWrapper ]; buildInputs = [ - wxGTK32 + wxwidgets_3_2 openal curl libtorrent-rasterbar diff --git a/pkgs/servers/klipper/klipper-firmware.nix b/pkgs/servers/klipper/klipper-firmware.nix index 6b812db3a336..90b29f33d987 100644 --- a/pkgs/servers/klipper/klipper-firmware.nix +++ b/pkgs/servers/klipper/klipper-firmware.nix @@ -7,7 +7,7 @@ args@{ bintools-unwrapped, libffi, libusb1, - wxGTK32, + wxwidgets_3_2, python3, gcc-arm-embedded, klipper, @@ -41,7 +41,7 @@ stdenv.mkDerivation { avrdude stm32flash pkg-config - wxGTK32 # Required for bossac + wxwidgets_3_2 # Required for bossac ]; configurePhase = '' diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index c1c75403d5fa..8a1fb92d513c 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -23,7 +23,7 @@ libxaw, aquaterm ? false, withWxGTK ? false, - wxGTK32, + wxwidgets_3_2, fontconfig, gnused, coreutils, @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { qtbase qtsvg ] - ++ lib.optional withWxGTK wxGTK32; + ++ lib.optional withWxGTK wxwidgets_3_2; postPatch = '' # lrelease is in qttools, not in qtbase. diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4b735b0af592..81402dbf0a26 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2043,6 +2043,8 @@ mapAliases { wrapGradle = throw "'wrapGradle' has been removed; use `gradle-packages.wrapGradle` or `(gradle-packages.mkGradle { ... }).wrapped` instead"; # Added 2025-11-02 wring = throw "'wring' has been removed since it has been abandoned upstream"; # Added 2025-11-07 write_stylus = throw "'write_stylus' has been renamed to/replaced by 'styluslabs-write-bin'"; # Converted to throw 2025-10-27 + wxGTK31 = warnAlias "'wxGTK31' has been renamed to 'wxwidgets_3_1'" wxwidgets_3_1; # Added 2026-02-12 + wxGTK32 = warnAlias "'wxGTK32' has been renamed to 'wxwidgets_3_2'" wxwidgets_3_2; # Added 2026-02-12 wxGTK33 = wxwidgets_3_3; # Added 2025-07-20 wxSVG = warnAlias "'wxSVG' has been renamed to 'wxsvg'" wxsvg; xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5e2785c51cd..129b11192e8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10342,7 +10342,7 @@ with pkgs; diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; diff-pdf = callPackage ../applications/misc/diff-pdf { - wxGTK = wxGTK32; + wxGTK = wxwidgets_3_2; }; mypaint-brushes1 = callPackage ../development/libraries/mypaint-brushes/1.0.nix { }; @@ -12067,7 +12067,7 @@ with pkgs; }; wxmaxima = callPackage ../applications/science/math/wxmaxima { - wxGTK = wxGTK32.override { + wxGTK = wxwidgets_3_2.override { withWebKit = true; }; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 942dc19f5172..b3da3950b9dc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -604,7 +604,7 @@ with self; propagatedBuildInputs = [ pkgs.pkg-config pkgs.gtk3 - pkgs.wxGTK32 + pkgs.wxwidgets_3_2 ModulePluggable ]; buildInputs = [ LWPProtocolHttps ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1bcb6529dc79..b61cd0202d38 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20972,7 +20972,7 @@ self: super: with self; { wurlitzer = callPackage ../development/python-modules/wurlitzer { }; wxpython = callPackage ../development/python-modules/wxpython/4.2.nix { - wxGTK = pkgs.wxGTK32.override { withWebKit = true; }; + wxGTK = pkgs.wxwidgets_3_2.override { withWebKit = true; }; }; wyoming = callPackage ../development/python-modules/wyoming { };