cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

treewide: drop wxGTK30-gtk2

Browse source
This commit is contained in:
Weijia Wang 2022-12-03 03:28:32 +01:00
parent cee75d23a9
commit 07cd65bea2
23 changed files with 49 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/audio/sooperlooper/default.nix
View file

@ -9,7 +9,7 @@
, libxml2 , libxml2
, libjack2 , libjack2
, libsndfile , libsndfile
, wxGTK30-gtk3 , wxGTK30
, libsigcxx , libsigcxx
, libsamplerate , libsamplerate
, rubberband , rubberband
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
libxml2 libxml2
libjack2 libjack2
libsndfile libsndfile
wxGTK30-gtk3 wxGTK30
libsigcxx libsigcxx
libsamplerate libsamplerate
rubberband rubberband

4
pkgs/applications/audio/spek/default.nix
View file

@ -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 { stdenv.mkDerivation rec {
pname = "spek"; pname = "spek";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ];
buildInputs = [ ffmpeg wxGTK30-gtk3 wxGTK30-gtk3.gtk ]; buildInputs = [ ffmpeg wxGTK30 gtk3 ];
meta = with lib; { meta = with lib; {
description = "Analyse your audio files by showing their spectrogram"; description = "Analyse your audio files by showing their spectrogram";

4
pkgs/applications/emulators/dolphin-emu/default.nix
View file

@ -21,7 +21,7 @@
, fetchFromGitHub , fetchFromGitHub
, libusb1 , libusb1
, libevdev , libevdev
, wxGTK30-gtk3 , wxGTK30
, soundtouch , soundtouch
, miniupnpc , miniupnpc
, mbedtls , mbedtls
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
portaudio portaudio
libusb1 libusb1
libpulseaudio libpulseaudio
wxGTK30-gtk3 wxGTK30
soundtouch soundtouch
miniupnpc miniupnpc
mbedtls mbedtls

4
pkgs/applications/misc/lenmus/default.nix
View file

@ -11,7 +11,7 @@
, libpng , libpng
, pngpp , pngpp
, zlib , zlib
, wxGTK30-gtk3 , wxGTK30
, wxsqlite3 , wxsqlite3
}: }:
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
libpng libpng
pngpp pngpp
zlib zlib
wxGTK30-gtk3 wxGTK30
wxsqlite3 wxsqlite3
]; ];

2
pkgs/applications/misc/lutris/fhsenv.nix
View file

@ -30,7 +30,7 @@ in buildFHSUserEnv {
# DGen // TODO: libarchive is broken # DGen // TODO: libarchive is broken
# Dolphin # 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 wavpack orc nettle gmp pcre vulkan-loader
# DOSBox # DOSBox

4
pkgs/applications/misc/mediainfo-gui/default.nix
View file

@ -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 }: , desktop-file-utils, libSM, imagemagick }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ autoreconfHook pkg-config ]; 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/"; sourceRoot = "./MediaInfo/Project/GNU/GUI/";

4
pkgs/applications/misc/pwsafe/default.nix
View file

@ -6,7 +6,7 @@
, zip , zip
, gettext , gettext
, perl , perl
, wxGTK30-gtk3 , wxGTK30
, libXext , libXext
, libXi , libXi
, libXt , libXt
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
libXi libXi
libXt libXt
libXtst libXtst
wxGTK30-gtk3 wxGTK30
curl curl
qrencode qrencode
libuuid libuuid

7
pkgs/applications/networking/ftp/filezilla/default.nix
View file

@ -12,7 +12,8 @@
, sqlite , sqlite
, tinyxml , tinyxml
, wrapGAppsHook , wrapGAppsHook
, wxGTK30-gtk3 , wxGTK30
, gtk3
, xdg-utils , xdg-utils
}: }:
@ -42,8 +43,8 @@ stdenv.mkDerivation rec {
pugixml pugixml
sqlite sqlite
tinyxml tinyxml
wxGTK30-gtk3 wxGTK30
wxGTK30-gtk3.gtk gtk3
xdg-utils xdg-utils
]; ];

4
pkgs/applications/science/astronomy/phd2/default.nix
View file

@ -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 }: , curl, gettext, glib, indi-full, libnova, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 gtk3
wxGTK30-gtk3 wxGTK30
curl curl
gettext gettext
glib glib

4
pkgs/applications/version-management/rapidsvn/default.nix
View file

@ -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 { stdenv.mkDerivation rec {
pname = "rapidsvn"; pname = "rapidsvn";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p"; sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
}; };
buildInputs = [ wxGTK30-gtk3 subversion apr aprutil python3 ]; buildInputs = [ wxGTK30 subversion apr aprutil python3 ];
NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; NIX_CFLAGS_COMPILE = [ "-std=c++14" ];

4
pkgs/applications/video/dvdstyler/default.nix
View file

@ -17,7 +17,7 @@
, libjpeg , libjpeg
, pkg-config , pkg-config
, wrapGAppsHook , wrapGAppsHook
, wxGTK30-gtk3 # crash with wxGTK30 with GTK2 compat , wxGTK30 # crash with wxGTK30 with GTK2 compat
, wxSVG , wxSVG
, xine-ui , xine-ui
, xmlto , xmlto
@ -62,7 +62,7 @@ in stdenv.mkDerivation rec {
libexif libexif
libjpeg libjpeg
wxSVG wxSVG
wxGTK30-gtk3 wxGTK30
xine-ui xine-ui
] ]
++ optionals dvdisasterSupport [ dvdisaster ] ++ optionals dvdisasterSupport [ dvdisaster ]

4
pkgs/development/libraries/openscenegraph/default.nix
View file

@ -23,7 +23,7 @@
sdlSupport ? false, SDL2, sdlSupport ? false, SDL2,
restSupport ? false, asio, restSupport ? false, asio,
withApps ? false, withApps ? false,
withExamples ? false, fltk, wxGTK30-gtk3, withExamples ? false, fltk, wxGTK30,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
++ lib.optional luaSupport lua ++ lib.optional luaSupport lua
++ lib.optional sdlSupport SDL2 ++ lib.optional sdlSupport SDL2
++ lib.optional restSupport asio ++ lib.optional restSupport asio
++ lib.optionals withExamples [ fltk wxGTK30-gtk3 ] ++ lib.optionals withExamples [ fltk wxGTK30 ]
++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ] ++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ]
++ lib.optional (restSupport || colladaSupport) boost ++ lib.optional (restSupport || colladaSupport) boost
; ;

10
pkgs/development/libraries/wxwidgets/wxGTK30.nix
View file

@ -3,8 +3,6 @@
, expat , expat
, fetchFromGitHub , fetchFromGitHub
, gst_all_1 , gst_all_1
, withGtk2 ? true
, gtk2
, gtk3 , gtk3
, libGL , libGL
, libGLU , libGLU
@ -34,11 +32,6 @@
, WebKit , WebKit
}: }:
assert withGtk2 -> (!withWebKit);
let
gtk = if withGtk2 then gtk2 else gtk3;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wxwidgets"; pname = "wxwidgets";
version = "3.0.5.1"; version = "3.0.5.1";
@ -60,7 +53,7 @@ stdenv.mkDerivation rec {
libjpeg_turbo libjpeg_turbo
zlib zlib
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
gtk gtk3
libSM libSM
libXinerama libXinerama
libXxf86vm libXxf86vm
@ -148,7 +141,6 @@ stdenv.mkDerivation rec {
}; };
passthru = { passthru = {
inherit gtk;
inherit compat26 compat28 unicode; inherit compat26 compat28 unicode;
}; };
} }

5
pkgs/development/python-modules/wxPython/4.0.nix
View file

@ -12,6 +12,7 @@
, ncurses , ncurses
, libintl , libintl
, wxGTK , wxGTK
, gtk3
, IOKit , IOKit
, Carbon , Carbon
, Cocoa , Cocoa
@ -42,7 +43,7 @@ buildPythonPackage rec {
then then
[ AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL ] [ AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL ]
else else
[ wxGTK.gtk ] [ gtk3 ]
); );
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -58,7 +59,7 @@ buildPythonPackage rec {
--replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")' --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")'
substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
--replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [ --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"), ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"),
("appsvc", None) ("appsvc", None)
]}' ]}'

6
pkgs/games/megaglest/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc { 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 , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib
, fetchFromGitHub, fetchpatch , fetchFromGitHub, fetchpatch
}: }:
@ -9,7 +9,7 @@ let
name = "megaglest-lib-env"; name = "megaglest-lib-env";
paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext
xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype 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 { path-env = buildEnv {
name = "megaglest-path-env"; name = "megaglest-path-env";
@ -38,7 +38,7 @@ stdenv.mkDerivation {
]; ];
nativeBuildInputs = [ cmake pkg-config makeWrapper git ]; 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 ]; glib cppunit fontconfig freetype ftgl glew libogg libvorbis libGLU ];
cmakeFlags = [ cmakeFlags = [

4
pkgs/games/rigsofrods/default.nix
View file

@ -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, pkg-config, libuuid, openal, ogre, ois, curl, gtk3, mygui, unzip,
angelscript, ogrepaged, mysocketw, libxcb angelscript, ogrepaged, mysocketw, libxcb
}: }:
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ cmake pkg-config unzip ]; 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 libuuid openal ogre ois curl gtk3 mygui angelscript
ogrepaged mysocketw libxcb ]; ogrepaged mysocketw libxcb ];

4
pkgs/servers/klipper/klipper-firmware.nix
View file

@ -5,7 +5,7 @@
, bintools-unwrapped , bintools-unwrapped
, libffi , libffi
, libusb1 , libusb1
, wxGTK30-gtk3 , wxGTK30
, python3 , python3
, gcc-arm-embedded , gcc-arm-embedded
, klipper , klipper
@ -28,7 +28,7 @@
avrdude avrdude
stm32flash stm32flash
pkg-config pkg-config
wxGTK30-gtk3 # Required for bossac wxGTK30 # Required for bossac
]; ];
preBuild = "cp ${firmwareConfig} ./.config"; preBuild = "cp ${firmwareConfig} ./.config";

4
pkgs/tools/networking/p2p/amule/default.nix
View file

@ -7,7 +7,7 @@
, lib , lib
, cmake , cmake
, zlib , 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 , perl
, cryptopp , cryptopp
, libupnp , libupnp
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
zlib zlib
wxGTK30-gtk3 wxGTK30
perl perl
cryptopp.dev cryptopp.dev
libupnp libupnp

4
pkgs/tools/text/poedit/default.nix
View file

@ -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, boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml,
nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: nlohmann_json, hicolor-icon-theme, wrapGAppsHook }:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
libxslt xmlto boost libtool pkg-config ]; 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 ]; propagatedBuildInputs = [ gettext ];

2
pkgs/top-level/aliases.nix
View file

@ -1590,6 +1590,8 @@ mapAliases ({
wxGTK = throw "wxGTK28 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04 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 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 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-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 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 wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31

13
pkgs/top-level/all-packages.nix
View file

@ -2062,7 +2062,7 @@ with pkgs;
pcem = callPackage ../applications/emulators/pcem { }; pcem = callPackage ../applications/emulators/pcem { };
pcsx2 = callPackage ../applications/emulators/pcsx2 { pcsx2 = callPackage ../applications/emulators/pcsx2 {
wxGTK = wxGTK30-gtk3; wxGTK = wxGTK30;
}; };
pcsxr = callPackage ../applications/emulators/pcsxr { }; pcsxr = callPackage ../applications/emulators/pcsxr { };
@ -10682,7 +10682,7 @@ with pkgs;
pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; pod2mdoc = callPackage ../tools/misc/pod2mdoc { };
poedit = callPackage ../tools/text/poedit { poedit = callPackage ../tools/text/poedit {
wxGTK30-gtk3 = wxGTK30-gtk3.override { withWebKit = true; }; wxGTK30 = wxGTK30.override { withWebKit = true; };
}; };
polaris = callPackage ../servers/polaris { }; polaris = callPackage ../servers/polaris { };
@ -16703,7 +16703,7 @@ with pkgs;
bloop = callPackage ../development/tools/build-managers/bloop { }; bloop = callPackage ../development/tools/build-managers/bloop { };
bossa = callPackage ../development/embedded/bossa { bossa = callPackage ../development/embedded/bossa {
wxGTK = wxGTK30-gtk3; wxGTK = wxGTK30;
}; };
bossa-arduino = callPackage ../development/embedded/bossa/arduino.nix { }; bossa-arduino = callPackage ../development/embedded/bossa/arduino.nix { };
@ -23159,12 +23159,9 @@ with pkgs;
}; };
wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix { wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix {
withGtk2 = true;
inherit (darwin.stubs) setfile; inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit; 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 { wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix {
inherit (darwin.stubs) derez rez setfile; inherit (darwin.stubs) derez rez setfile;
@ -23182,7 +23179,7 @@ with pkgs;
}; };
wxSVG = callPackage ../development/libraries/wxSVG { wxSVG = callPackage ../development/libraries/wxSVG {
wxGTK = wxGTK30-gtk3; wxGTK = wxGTK30;
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
}; };
@ -31755,7 +31752,7 @@ with pkgs;
radioboat = callPackage ../applications/audio/radioboat { }; radioboat = callPackage ../applications/audio/radioboat { };
radiotray-ng = callPackage ../applications/audio/radiotray-ng { radiotray-ng = callPackage ../applications/audio/radiotray-ng {
wxGTK = wxGTK30-gtk3; wxGTK = wxGTK30;
}; };
raiseorlaunch = callPackage ../applications/misc/raiseorlaunch {}; raiseorlaunch = callPackage ../applications/misc/raiseorlaunch {};

2
pkgs/top-level/perl-packages.nix
View file

@ -389,7 +389,7 @@ let
substituteInPlace Build.PL \ substituteInPlace Build.PL \
--replace "gtk+-2.0" "gtk+-3.0" --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 ]; buildInputs = [ LWPProtocolHttps ];
meta = { meta = {
description = "Building, finding and using wxWidgets binaries"; description = "Building, finding and using wxWidgets binaries";

2
pkgs/top-level/python-packages.nix
View file

@ -12039,7 +12039,7 @@ self: super: with self; {
wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix {
inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL; inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL;
wxGTK = pkgs.wxGTK30-gtk3.override { wxGTK = pkgs.wxGTK30.override {
withWebKit = true; withWebKit = true;
}; };
}; };