wxwidgets_3_{1,2}: rename from wxGTK3{1,2}

fit attrname to pname
This commit is contained in:
quantenzitrone 2026-02-12 10:24:54 +01:00
parent c97aa3f2ba
commit 62efab0dad
No known key found for this signature in database
95 changed files with 203 additions and 201 deletions

View file

@ -23,7 +23,7 @@ in
description = "Nix top-level packages to be compiled using CCache";
default = [ ];
example = [
"wxGTK32"
"wxwidgets_3_2"
"ffmpeg"
"libav_all"
];

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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
]
++ (

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -30,8 +30,8 @@
sqlite,
vigra,
wrapGAppsHook3,
wxGTK32,
wxGTK' ? wxGTK32,
wxwidgets_3_2,
wxGTK' ? wxwidgets_3_2,
zlib,
}:

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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=\"${

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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;
};
})

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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;
};
})

View file

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

View file

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

View file

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

View file

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

View file

@ -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" ];

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -604,7 +604,7 @@ with self;
propagatedBuildInputs = [
pkgs.pkg-config
pkgs.gtk3
pkgs.wxGTK32
pkgs.wxwidgets_3_2
ModulePluggable
];
buildInputs = [ LWPProtocolHttps ];

View file

@ -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 { };