diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index 89051e70b519..748ce090c776 100644 --- a/pkgs/applications/audio/tenacity/default.nix +++ b/pkgs/applications/audio/tenacity/default.nix @@ -2,7 +2,8 @@ , lib , fetchFromSourcehut , cmake -, wxGTK +, wxGTK31 +, gtk3 , pkg-config , python3 , gettext @@ -123,8 +124,8 @@ stdenv.mkDerivation rec { sratom suil twolame - wxGTK - wxGTK.gtk + wxGTK31 + gtk3 ] ++ lib.optionals stdenv.isLinux [ at-spi2-core dbus diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 032fd765b27f..7a1c0af2c643 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK31-gtk3, gtk3 +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK31, gtk3 , contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ]; - buildInputs = [ wxGTK31-gtk3 gtk3 ] + buildInputs = [ wxGTK31 gtk3 ] ++ optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index db7278c23bd3..3fd7a488e40b 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -7,7 +7,7 @@ , pkg-config # not native , gdal -, wxGTK31-gtk3 +, wxGTK31 , proj , dxflib , curl @@ -56,7 +56,7 @@ mkDerivation rec { libsvm hdf5 gdal - wxGTK31-gtk3 + wxGTK31 proj libharu opencv diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 1592ef546155..75c1ed16e1d1 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -28,13 +28,13 @@ , qhull , systemd , tbb -, wxGTK31-gtk3 +, wxGTK31 , xorg , fetchpatch -, wxGTK31-gtk3-override ? null +, wxGTK31-override ? null }: let - wxGTK31-gtk3-prusa = wxGTK31-gtk3.overrideAttrs (old: rec { + wxGTK31-prusa = wxGTK31.overrideAttrs (old: rec { pname = "wxwidgets-prusa3d-patched"; version = "3.1.4"; src = fetchFromGitHub { @@ -45,7 +45,7 @@ let fetchSubmodules = true; }; }); - wxGTK31-gtk3-override' = if wxGTK31-gtk3-override == null then wxGTK31-gtk3-prusa else wxGTK31-gtk3-override; + wxGTK31-override' = if wxGTK31-override == null then wxGTK31-prusa else wxGTK31-override; in stdenv.mkDerivation rec { pname = "prusa-slicer"; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { pcre systemd tbb - wxGTK31-gtk3-override' + wxGTK31-override' xorg.libX11 ] ++ checkInputs; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index b385542d679a..a3c8fc6cdcc6 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer, wxGTK31-gtk3 }: +{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer, wxGTK31 }: let appname = "SuperSlicer"; pname = "super-slicer"; @@ -71,7 +71,7 @@ let passthru = allVersions; }; - prusa-slicer' = prusa-slicer.override { wxGTK31-gtk3-override = wxGTK31-gtk3; }; + prusa-slicer' = prusa-slicer.override { wxGTK31-override = wxGTK31; }; allVersions = builtins.mapAttrs (_name: version: (prusa-slicer'.overrideAttrs (override version))) versions; in allVersions.stable diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 1503230b3afd..f81710cfb911 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -5,6 +5,7 @@ , libGL , zlib , wxGTK +, gtk3 , libX11 , gettext , glew @@ -143,7 +144,7 @@ stdenv.mkDerivation rec { zlib libX11 wxGTK - wxGTK.gtk + gtk3 pcre libXdmcp gettext diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 95e88ff14071..9042862eac32 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -2,7 +2,8 @@ , fetchFromGitLab , gnome , dconf -, wxGTK31-gtk3 +, wxGTK31 +, gtk3 , makeWrapper , gsettings-desktop-schemas , hicolor-icon-theme @@ -103,7 +104,7 @@ let if srcOverridep "libVersion" then srcs.libVersion else versionsImport.${baseName}.libVersion.version; - wxGTK = wxGTK31-gtk3; + wxGTK = wxGTK31; python = python3; wxPython = python.pkgs.wxPython_4_1; @@ -143,7 +144,7 @@ stdenv.mkDerivation rec { "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share" - "--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}" + "--prefix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}" "--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" # wrapGAppsHook did these two as well, no idea if it matters... "--prefix XDG_DATA_DIRS : ${cups}/share" diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index d84c8a5aa5e4..af673695ace5 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -4,7 +4,6 @@ , fetchurl , gnome2 , gst_all_1 -, gtk2 , gtk3 , libGL , libGLU @@ -18,7 +17,6 @@ , compat30 ? true , unicode ? true , withEGL ? true -, withGtk2 ? (!stdenv.isDarwin) , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , withWebKit ? stdenv.isDarwin , webkitgtk @@ -33,11 +31,6 @@ , WebKit }: -assert withGtk2 -> (!withWebKit); - -let - gtk = if withGtk2 then gtk2 else gtk3; -in stdenv.mkDerivation rec { pname = "wxwidgets"; version = "3.1.5"; @@ -60,18 +53,14 @@ stdenv.mkDerivation rec { buildInputs = [ gst_all_1.gst-plugins-base gst_all_1.gstreamer - ] - ++ lib.optionals (!stdenv.isDarwin) [ - gtk + ] ++ lib.optionals (!stdenv.isDarwin) [ + gtk3 libSM libXinerama libXtst libXxf86vm xorgproto ] - ++ lib.optionals withGtk2 [ - gnome2.GConf - ] ++ lib.optional withMesa libGLU ++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit @@ -102,8 +91,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ "--with-osx_cocoa" "--with-libiconv" - ] - ++ lib.optionals withWebKit [ + ] ++ lib.optionals withWebKit [ "--enable-webview" "--enable-webviewwebkit" ]; @@ -133,6 +121,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + inherit compat28 compat30 unicode; + }; + meta = with lib; { homepage = "https://www.wxwidgets.org/"; description = "A Cross-Platform C++ GUI Library"; @@ -150,9 +142,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ tfmoraes ]; platforms = platforms.unix; }; - - passthru = { - inherit gtk; - inherit compat28 compat30 unicode; - }; } diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix index dceab0dd26a9..3198dbc004c3 100644 --- a/pkgs/development/python-modules/wxPython/4.1.nix +++ b/pkgs/development/python-modules/wxPython/4.1.nix @@ -13,6 +13,7 @@ , ncurses , pango , wxGTK +, gtk3 , AGL , AudioToolbox , AVFoundation @@ -70,7 +71,7 @@ buildPythonPackage rec { nativeBuildInputs = [ which doxygen - wxGTK.gtk + gtk3 pkg-config setuptools ] ++ lib.optionals stdenv.isLinux [ @@ -78,7 +79,7 @@ buildPythonPackage rec { ]; buildInputs = [ - wxGTK.gtk + gtk3 ncurses ] ++ lib.optionals stdenv.isLinux [ libXinerama @@ -120,7 +121,7 @@ buildPythonPackage rec { preConfigure = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [ - ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-3.0.so"), + ("gdk", "${gtk3}/lib/libgtk-x11-3.0.so"), ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), ("cairoLib = None", "cairoLib = ctypes.CDLL('${cairo}/lib/libcairo.so')"), ("appsvc", None) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f892c5de4af0..ac16901e15bd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1550,6 +1550,8 @@ mapAliases ({ wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name wmii_hg = wmii; ws = throw "ws has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 + wxGTK31-gtk2 = throw "'wxGTK31-gtk2' has been removed from nixpkgs as it depends on deprecated GTK2"; # Added 2022-10-27 + wxGTK31-gtk3 = throw "'wxGTK31-gtk3' has been renamed to/replaced by 'wxGTK31'"; # Added 2022-10-27 wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31 wxcam = throw "'wxcam' has seen no updates in ten years, crashes (SIGABRT) on startup and depends on deprecated wxGTK28/GNOME2/GTK2, use 'gnome.cheese'"; # Added 2022-06-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae6f203331d9..7a38896ff4e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22769,8 +22769,6 @@ with pkgs; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit; }; - wxGTK31-gtk2 = wxGTK31.override { withGtk2 = true; }; - wxGTK31-gtk3 = wxGTK31.override { withGtk2 = false; }; wxGTK32 = callPackage ../development/libraries/wxwidgets/wxGTK32.nix { inherit (darwin.stubs) setfile; @@ -31766,14 +31764,14 @@ with pkgs; prusa-slicer = callPackage ../applications/misc/prusa-slicer { }; super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { - wxGTK31-gtk3 = wxGTK31-gtk3.override { + wxGTK31 = wxGTK31.override { # https://github.com/supermerill/SuperSlicer/issues/1093 withEGL = false; }; }; super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { - wxGTK31-gtk3 = wxGTK31-gtk3.override { + wxGTK31 = wxGTK31.override { # https://github.com/supermerill/SuperSlicer/issues/1093 withEGL = false; }; @@ -32057,7 +32055,7 @@ with pkgs; temporal-cli = callPackage ../applications/networking/cluster/temporal-cli { }; - tenacity = callPackage ../applications/audio/tenacity { wxGTK = wxGTK31-gtk3; }; + tenacity = callPackage ../applications/audio/tenacity { }; tendermint = callPackage ../tools/networking/tendermint { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 02897df6519b..c0202aab5592 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11907,7 +11907,7 @@ self: super: with self; { wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix { inherit (pkgs.darwin.apple_sdk.frameworks) AGL AudioToolbox AVFoundation AVKit Carbon Cocoa CoreMedia CoreFoundation IOKit Kernel OpenGL Security WebKit; - wxGTK = pkgs.wxGTK31-gtk3.override { + wxGTK = pkgs.wxGTK31.override { withWebKit = true; }; };