diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 9240b5d8910e4..aee162a6464e6 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, gtk2, wxGTK30, libpulseaudio, curl, +{ stdenv, fetchFromGitHub, pkgconfig, cmake, wxGTK30, libpulseaudio, curl, gettext, glib, portaudio }: stdenv.mkDerivation rec { @@ -13,14 +13,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake gtk2 wxGTK30 libpulseaudio curl gettext + buildInputs = [ cmake wxGTK30 wxGTK30.gtk libpulseaudio curl gettext glib portaudio ]; - cmakeFlags = [ - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" - ]; - enableParallelBuilding = true; meta = { diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index f3cd6fdb0f628..16dc39bc1fdf4 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, cmake, pkgconfig +{ stdenv, lib, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wrapGAppsHook , boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK30 -, gtest, nlopt, xorg, makeDesktopItem +, gtest, nlopt, xorg, makeDesktopItem, gnome3 }: let nloptVersion = if lib.hasAttr "version" nlopt @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { cmake makeWrapper pkgconfig + wrapGAppsHook ]; buildInputs = [ @@ -30,10 +31,12 @@ stdenv.mkDerivation rec { tbb wxGTK30 xorg.libX11 - ] ++ checkInputs; + ]; checkInputs = [ gtest ]; + doCheck = true; + # The build system uses custom logic - defined in # xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source - # for finding the nlopt library, which doesn't pick up the package in the nix store. @@ -66,6 +69,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSLIC3R_FHS=1" "-DSLIC3R_WX_STABLE=1" # necessary when compiling against wxGTK 3.0 + "-DSLIC3R_GTK=3" ]; postInstall = '' diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index d2d5e9548a0c3..79eb0dc5d2052 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, zip, which, wrapGAppsHook +, wxGTK, sfml, fluidsynth, curl, freeimage, ftgl, glew +}: stdenv.mkDerivation rec { pname = "slade"; - version = "3.1.1.5"; + version = "3.1.7"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; rev = version; - sha256 = "0mdn59jm6ab4cdh99bgvadif3wdlqmk5mq635gg7krq35njgw6f6"; + sha256 = "1yfq7ghg9whys7a07xfcza8rwyfhnrcz6qi5bay1ilj3ml4m12zy"; }; - nativeBuildInputs = [ cmake pkgconfig zip ]; - buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; + nativeBuildInputs = [ cmake pkgconfig zip which wrapGAppsHook ]; + buildInputs = [ wxGTK wxGTK.gtk sfml fluidsynth curl freeimage ftgl glew ]; enableParallelBuilding = true; meta = with stdenv.lib; { description = "Doom editor"; - homepage = http://slade.mancubus.net/; + homepage = "http://slade.mancubus.net/"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix deleted file mode 100644 index 9ee30d347b0a8..0000000000000 --- a/pkgs/applications/misc/slade/git.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: - -stdenv.mkDerivation { - name = "slade-git-3.1.2.2018.01.29"; - - src = fetchFromGitHub { - owner = "sirjuddington"; - repo = "SLADE"; - rev = "f7409c504b40c4962f419038db934c32688ddd2e"; - sha256 = "14icxiy0r9rlcc10skqs1ylnxm1f0f3irhzfmx4sazq0pjv5ivld"; - }; - - cmakeFlags = ["-DNO_WEBVIEW=1"]; - nativeBuildInputs = [ cmake pkgconfig zip ]; - buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Doom editor"; - homepage = http://slade.mancubus.net/; - license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ ertes ]; - }; -} diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index 6a5e62f54e1e5..ce6cc86c2b6ed 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-wx-prefix=${wxGTK30}" ]; preConfigure = '' - export LDFLAGS="$LDFLAGS $(${wxGTK30}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk2u_aui-3.0" + export LDFLAGS="$LDFLAGS $(${wxGTK30}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk3u_aui-3.0" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index f12fdefc781b2..0c4bccd435058 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -4,7 +4,6 @@ , dbus , gettext , gnutls -, gtk2 , libfilezilla , libidn , nettle @@ -35,7 +34,6 @@ stdenv.mkDerivation rec { dbus gettext gnutls - gtk2 libfilezilla libidn nettle @@ -43,6 +41,7 @@ stdenv.mkDerivation rec { sqlite tinyxml wxGTK30 + wxGTK30.gtk xdg_utils ]; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index c806b558da0ec..1d059b409f51d 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl, libGLU_combined, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, -sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: +sqlite, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: let majorVersion = "7.14"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ]; buildInputs = [ - curl libGLU_combined libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver + curl libGLU_combined libXmu libXi freeglut libjpeg wxGTK30 wxGTK30.gtk sqlite libXScrnSaver libnotify patchelf libX11 libxcb xcbutil ]; diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 8d0336f582827..f8b81be07c9b0 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, boost, lua, zlib, bzip2 -, xylib, readline, gnuplot, swig3 }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, wxGTK30, boost, lua, zlib +, bzip2, xylib, readline, gnuplot, swig3 }: let name = "fityk"; @@ -15,6 +15,14 @@ stdenv.mkDerivation { sha256 = "0kmrjjjwrh6xgw590awcd52b86kksmv6rfgih75zvpiavr1ygwsi"; }; + patches = [ + # Allow building with GTK 3 + (fetchpatch { + url = "https://salsa.debian.org/science-team/fityk/raw/67b995963dba56914d25ab3bbcd420fcba24861d/debian/patches/permit-gtk3.patch"; + sha256 = "12by8w0gd0n8qkljn7lhlz9lhdswpkygkpszm77anrqz54hd3gqr"; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ wxGTK30 boost lua zlib bzip2 xylib readline gnuplot swig3 ]; diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix deleted file mode 100644 index 99159fba5b435..0000000000000 --- a/pkgs/applications/science/misc/golly/beta.nix +++ /dev/null @@ -1,51 +0,0 @@ -{stdenv, fetchgit -, wxGTK, perl, python2, zlib, libGLU_combined, libX11 -, automake, autoconf -}: - -stdenv.mkDerivation rec { - pname = "golly"; - version = "2.8.99.2.20161122"; - #src = fetchurl { - # url="mirror://sourceforge/project/golly/golly/golly-2.8/golly-2.8-src.tar.gz"; - # sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204"; - #}; - src = fetchgit { - url = "git://git.code.sf.net/p/golly/code"; - rev = "93495edf3c9639332c6eb43ca7149c69629ee5d8"; - sha256 = "1j308s9zlqkr3wnl1l32s5zk7r3g4ijwawkkysl8j5ik9sibi2gk"; - }; - - setSourceRoot = '' - export sourceRoot="$(echo */gui-wx/configure)" - ''; - - nativeBuildInputs = [autoconf automake]; - - buildInputs = [ - wxGTK perl python2 zlib libGLU_combined libX11 - ]; - - # Link against Python explicitly as it is needed for scripts - makeFlags=[ - "AM_LDFLAGS=" - ]; - NIX_LDFLAGS="-l${python2.libPrefix} -lperl -ldl -lGL"; - preConfigure='' - export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE - -DPYTHON_SHLIB=$(basename "$( - readlink -f ${python2}/lib/libpython*.so)")" - - sh autogen.sh - ''; - - meta = { - inherit version; - description = "Cellular automata simulation program"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - downloadPage = "https://sourceforge.net/projects/golly/files/golly"; - }; -} diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index 9ca15d4977b91..c3d76da9709e4 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }: +{ stdenv, fetchFromGitHub, wrapGAppsHook, wxGTK, wxsqlite3, sqlite, glib }: stdenv.mkDerivation rec { pname = "wxsqliteplus"; @@ -8,10 +8,12 @@ stdenv.mkDerivation rec { owner = "guanlisheng"; repo = "wxsqliteplus"; rev = "v${version}"; - sha1 = "yr9ysviv4hbrxn900z1wz8j32frimvx1"; + sha256 = "0mgfq813pli56mar7pdxlhwjf5k10j196rs3jd0nc8b6dkzkzlnf"; }; - buildInputs = [ wxGTK wxsqlite3 sqlite ]; + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = [ wxGTK wxsqlite3 sqlite glib ]; makeFlags = [ "LDFLAGS=-L${wxsqlite3}/lib" @@ -20,7 +22,7 @@ stdenv.mkDerivation rec { preBuild = '' sed -ie 's|all: $(LIBPREFIX)wxsqlite$(LIBEXT)|all: |g' Makefile sed -ie 's|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) $(LIBPREFIX)wxsqlite$(LIBEXT)|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) |g' Makefile - sed -ie 's|-lwxsqlite |-lwxcode_gtk2u_wxsqlite3-3.0 |g' Makefile + sed -ie 's|-lwxsqlite |-lwxcode_gtk3u_wxsqlite3-3.0 |g' Makefile ''; installPhase = '' diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index a12447562b81b..4f2653b191ec1 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -5,7 +5,7 @@ , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true -, withGtk2 ? true +, withGtk2 ? false , withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index 8fe75153de6d6..90ca0ab248f47 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -4,7 +4,7 @@ , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported, libGLU ? null, libGL ? null , compat28 ? false, compat30 ? true, unicode ? true -, withGtk2 ? true +, withGtk2 ? false , withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index 98461dfb40442..aa5937947d8d5 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -56,10 +56,9 @@ buildPythonPackage rec { --replace "return wxPyTestDisplayAvailable();" "return true;" '' + lib.optionalString (!stdenv.isDarwin) '' substituteInPlace wx/lib/wxcairo.py \ - --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")' - substituteInPlace wx/lib/wxcairo.py \ + --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")' \ --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [ - ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-2.0.so"), + ("gdk", "${wxGTK.gtk}/lib/libgdk-3.so"), ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), ("appsvc", None) ]}' @@ -68,7 +67,7 @@ buildPythonPackage rec { buildPhase = ""; installPhase = '' - ${python.interpreter} setup.py install WXPORT=${if stdenv.isDarwin then "osx_cocoa" else "gtk2"} NO_HEADERS=0 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out + ${python.interpreter} setup.py install WXPORT=${if stdenv.isDarwin then "osx_cocoa" else "gtk3"} NO_HEADERS=0 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out wrapPythonPrograms ''; diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 09550339f83db..21fde7b8be987 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU_combined, boost, - pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip, + pkgconfig, libuuid, openal, ogre, ois, curl, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ wxGTK30 freeimage cmake zziplib libGLU_combined boost - libuuid openal ogre ois curl gtk2 mygui unzip angelscript + libuuid openal ogre ois curl wxGTK30.gtk mygui unzip angelscript ogrepaged mysocketw libxcb ]; meta = { diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index 4d29c380483d5..5fb858594f166 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, gettext, pkgconfig, wxGTK30, - boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk2, gtkspell2, pugixml, + boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtkspell3, pugixml, nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook libxslt xmlto boost libtool pkgconfig ]; - buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk2 gtkspell2 hicolor-icon-theme ]; + buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml wxGTK30.gtk gtkspell3 hicolor-icon-theme ]; propagatedBuildInputs = [ gettext ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c227bbb198b9..f849ea9f64cdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2786,7 +2786,9 @@ in dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - dolphinEmu = callPackage ../misc/emulators/dolphin-emu { }; + dolphinEmu = callPackage ../misc/emulators/dolphin-emu { + wxGTK30 = wxGTK30.override { withGtk2 = true; }; + }; dolphinEmuMaster = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; @@ -2796,11 +2798,7 @@ in doom-bcc = callPackage ../games/zdoom/bcc-git.nix { }; slade = callPackage ../applications/misc/slade { - wxGTK = wxGTK30; - }; - - sladeUnstable = callPackage ../applications/misc/slade/git.nix { - wxGTK = wxGTK30; + wxGTK = wxGTK30.override { withWebKit = true; }; }; drive = callPackage ../applications/networking/drive { }; @@ -22927,6 +22925,7 @@ in mygui = mygui.override { withOgre = true; }; + wxGTK30 = wxGTK30.override { withGtk2 = true; }; }; riko4 = callPackage ../games/riko4 { }; @@ -24161,7 +24160,6 @@ in gravit = callPackage ../applications/science/astronomy/gravit { }; golly = callPackage ../applications/science/misc/golly { wxGTK = wxGTK30; }; - golly-beta = callPackage ../applications/science/misc/golly/beta.nix { wxGTK = wxGTK30; }; megam = callPackage ../applications/science/misc/megam { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9b9eb3ff230ae..be8c469ddc5a5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -250,8 +250,11 @@ let url = mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.69.tar.gz; sha256 = "0jg2dmkzhj03f6b0vmv597yryfw9cclsdn9ynvvlrzzgpd5lw8jk"; }; - propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK30 ModulePluggable ]; - buildInputs = [ LWPProtocolHttps ]; + # Don't try to find GTK2 + AUTOMATED_TESTING = false; + nativeBuildInputs = [ pkgs.pkgconfig ]; + propagatedBuildInputs = [ ModulePluggable ]; + buildInputs = [ pkgs.wxGTK30 LWPProtocolHttps ]; }; AnyEvent = buildPerlPackage { @@ -20080,6 +20083,10 @@ let url = mirror://cpan/authors/id/M/MD/MDOOTSON/Wx-0.9932.tar.gz; sha256 = "0w0vcpk8bmklh16c0z1vxgipnmvdw7cckcmay7k7cihgb99vdz8w"; }; + patches = [ (fetchpatch { + url = "https://src.fedoraproject.org/rpms/perl-Wx/raw/aad232e010f3aff77966442dae55b9266e876617/f/gtk3.patch"; + sha256 = "0gpc3ncf1q78y2hrzdw7965yy8q88h7jplzq6w6625nk613jd28a"; + }) ]; propagatedBuildInputs = [ AlienWxWidgets ]; # Testing requires an X server: # Error: Unable to initialize GTK, is DISPLAY set properly?" @@ -20094,7 +20101,8 @@ let url = mirror://cpan/authors/id/M/MB/MBARBON/Wx-GLCanvas-0.09.tar.gz; sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; }; - propagatedBuildInputs = [ pkgs.libGLU Wx ]; + buildInputs = [ pkgs.xorg.libX11 pkgs.libGLU ]; + propagatedBuildInputs = [ Wx ]; doCheck = false; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 061033f941966..2ec9deaaaccfc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5281,7 +5281,7 @@ in { wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { inherit (pkgs) pkgconfig; - wxGTK = pkgs.wxGTK30.override { withGtk2 = false; withWebKit = true; }; + wxGTK = pkgs.wxGTK30.override { withWebKit = true; }; }; xml2rfc = callPackage ../development/python-modules/xml2rfc { };