NixOS · alyssais · Apr 26, 2025 · Apr 13, 2025 · Apr 13, 2025 · Apr 14, 2025
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix
@@ -14,7 +14,7 @@
   libXtst,
   libsecret,
   gsettings-desktop-schemas,
-  webkitgtk_4_0,
+  webkitgtk_4_1,
   makeWrapper,
   perl,
   ...
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     libXtst
     libsecret
     zlib
-  ] ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0;
+  ] ++ lib.optional (webkitgtk_4_1 != null) webkitgtk_4_1;
 
   buildCommand = ''
     # Unpack tarball.
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
             libXtst
             libsecret
           ]
-          ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0
+          ++ lib.optional (webkitgtk_4_1 != null) webkitgtk_4_1
         )
       } \
       --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
@@ -16,7 +16,7 @@
   jdk,
   jdk8,
   gsettings-desktop-schemas,
-  webkitgtk_4_0 ? null, # for internal web browser
+  webkitgtk_4_1 ? null, # for internal web browser
   buildEnv,
   runCommand,
   callPackage,
@@ -64,7 +64,7 @@ let
       gtk
       libXtst
       gsettings-desktop-schemas
-      webkitgtk_4_0
+      webkitgtk_4_1
       makeWrapper
       ;
   };

diff --git a/pkgs/applications/editors/formiko/default.nix b/pkgs/applications/editors/formiko/default.nix
@@ -10,7 +10,7 @@
   gtkspell3,
   librsvg,
   pygobject3,
-  webkitgtk_4_0,
+  webkitgtk_4_1,
 }:
 
 buildPythonApplication rec {
@@ -37,7 +37,7 @@ buildPythonApplication rec {
     gtkspell3
     librsvg
     pygobject3
-    webkitgtk_4_0
+    webkitgtk_4_1
   ];
 
   # Needs a display

diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
@@ -8,7 +8,7 @@
   gtk3,
   gtksourceview,
   pango,
-  webkitgtk_4_0,
+  webkitgtk_4_1,
   pygobject3,
   pyyaml,
   setuptools,
@@ -39,7 +39,7 @@ buildPythonApplication rec {
     gtk3
     gtksourceview
     pango
-    webkitgtk_4_0
+    webkitgtk_4_1
     pygobject3
     pyyaml
   ];

diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
@@ -14,7 +14,7 @@
   gtk3,
   libnotify,
   pango,
-  webkitgtk_4_0,
+  webkitgtk_4_1,
   wrapGAppsHook3,
 
   # check inputs
@@ -96,7 +96,7 @@ buildPythonApplication rec {
       gtk3
       libnotify
       pango
-      webkitgtk_4_0
+      webkitgtk_4_1
     ]
     ++ (with gst_all_1; [
       gst-libav

diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix
@@ -21,7 +21,7 @@ let
       gtksourceview
       gnome-desktop
       libgnome-keyring
-      webkitgtk_4_0
+      webkitgtk_4_1
     ];
   xorgDeps =
     pkgs: with pkgs.xorg; [

diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -35,27 +35,14 @@
   libbgcode,
   heatshrink,
   catch2,
-  webkitgtk_4_0,
+  webkitgtk_4_1,
   withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
   systemd,
   wxGTK-override ? null,
   opencascade-override ? null,
 }:
 let
-  wxGTK-prusa = wxGTK32.overrideAttrs (old: {
-    pname = "wxwidgets-prusa3d-patched";
-    version = "3.2.0";
-    configureFlags = old.configureFlags ++ [ "--disable-glcanvasegl" ];
-    patches = [ ./wxWidgets-Makefile.in-fix.patch ];
-    src = fetchFromGitHub {
-      owner = "prusa3d";
-      repo = "wxWidgets";
-      rev = "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26";
-      hash = "sha256-rYvmNmvv48JSKVT4ph9AS+JdstnLSRmcpWz1IdgBzQo=";
-      fetchSubmodules = true;
-    };
-  });
-  nanosvg-fltk = nanosvg.overrideAttrs (old: rec {
+  nanosvg-fltk = nanosvg.overrideAttrs (old: {
     pname = "nanosvg-fltk";
     version = "unstable-2022-12-22";
 
@@ -67,7 +54,7 @@ let
     };
   });
   openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021_11; };
-  wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override;
+  wxGTK-override' = if wxGTK-override == null then wxGTK32 else wxGTK-override;
   opencascade-override' =
     if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override;
 in
@@ -88,6 +75,8 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/prusa3d/PrusaSlicer/commit/cdc3db58f9002778a0ca74517865527f50ade4c3.patch";
       hash = "sha256-zgpGg1jtdnCBaWjR6oUcHo5sGuZx5oEzpux3dpRdMAM=";
     })
+    # https://github.com/prusa3d/PrusaSlicer/pull/11769
+    ./fix-ambiguous-constructors.patch
   ];
 
   # required for GCC 14
@@ -137,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
       libbgcode
       heatshrink
       catch2
-      webkitgtk_4_0
+      webkitgtk_4_1
     ]
     ++ lib.optionals withSystemd [
       systemd

diff --git a/pkgs/applications/misc/prusa-slicer/fix-ambiguous-constructors.patch b/pkgs/applications/misc/prusa-slicer/fix-ambiguous-constructors.patch
@@ -0,0 +1,37 @@
+From 910328f3131e24e330808f5d4cb814454dbe201d Mon Sep 17 00:00:00 2001
+From: Gregor Riepl <onitake@gmail.com>
+Date: Mon, 27 Nov 2023 13:01:55 +0100
+Subject: [PATCH] Make initializers explicit to avoid ambiguous wxArrayString
+ overloads
+
+---
+ src/slic3r/GUI/PhysicalPrinterDialog.cpp | 2 +-
+ src/slic3r/GUI/Plater.cpp                | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+index 849e987c731..7d0c628c23f 100644
+--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
++++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+@@ -607,7 +607,7 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
+     // Always fill in the "printhost_port" combo box from the config and select it.
+     {
+         Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
+-        choice->set_values({ m_config->opt_string("printhost_port") });
++        choice->set_values(std::vector<std::string>({ m_config->opt_string("printhost_port") }));
+         choice->set_selection();
+     }
+
+diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
+index debfe625fd4..4d61e29a2dc 100644
+--- a/src/slic3r/GUI/Plater.cpp
++++ b/src/slic3r/GUI/Plater.cpp
+@@ -4420,7 +4420,7 @@ void Plater::load_project(const wxString& filename)
+     s_multiple_beds.set_loading_project_flag(true);
+     ScopeGuard guard([](){ s_multiple_beds.set_loading_project_flag(false);});
+
+-    if (! load_files({ into_path(filename) }).empty()) {
++    if (! load_files(std::vector<boost::filesystem::path>({ into_path(filename) })).empty()) {
+         // At least one file was loaded.
+         p->set_project_filename(filename);
+         // Save the names of active presets and project specific config into ProjectDirtyStateManager.
diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix
@@ -15,7 +15,7 @@
   gdk-pixbuf,
   cairo,
   pango,
-  webkitgtk_4_0,
+  webkitgtk_4_1,
   openssl,
   gstreamer,
   gst-libav,
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     cairo
     pango
     gtk3
-    webkitgtk_4_0
+    webkitgtk_4_1
     openssl
     libfixposix
   ];

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  buildPackages,
   vala,
-  cmake,
   ninja,
   wrapGAppsHook4,
   pkg-config,
@@ -15,17 +13,17 @@
   gtk4,
   glib-networking,
   libadwaita,
+  libcanberra,
   libnotify,
-  libsoup_2_4,
+  libsoup_3,
   libgee,
-  libsignal-protocol-c,
+  libomemo-c,
   libgcrypt,
+  meson,
   sqlite,
   gpgme,
-  pcre2,
   qrencode,
   icu,
-  gspell,
   srtp,
   libnice,
   gnutls,
@@ -34,30 +32,28 @@
   gst-plugins-good,
   gst-plugins-bad,
   gst-vaapi,
-  webrtc-audio-processing,
+  webrtc-audio-processing_1,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dino";
-  version = "0.4.5";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-lF2cUalCrVD6274Ey8wggEXNvKXydlRjvX+815geL1c=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Y3MGKpfhjmqnIvmt4mXnkmpjF/riXPDXyUiSrsceY6o=";
   };
 
   postPatch = ''
-    # don't overwrite manually set version information
-    substituteInPlace CMakeLists.txt \
-      --replace "include(ComputeVersion)" ""
+    echo ${finalAttrs.version} > VERSION
   '';
 
   nativeBuildInputs = [
     vala
-    cmake
-    ninja # https://github.com/dino/dino/issues/230
+    meson
+    ninja
     pkg-config
     wrapGAppsHook4
     gettext
@@ -76,11 +72,10 @@ stdenv.mkDerivation (finalAttrs: {
     libnotify
     gpgme
     libgcrypt
-    libsoup_2_4
-    pcre2
+    libsoup_3
     icu
-    libsignal-protocol-c
-    gspell
+    libcanberra
+    libomemo-c
     srtp
     libnice
     gnutls
@@ -89,35 +84,22 @@ stdenv.mkDerivation (finalAttrs: {
     gst-plugins-good # contains rtpbin, required for VP9
     gst-plugins-bad # required for H264, MSDK
     gst-vaapi # required for VAAPI
-    webrtc-audio-processing
+    webrtc-audio-processing_1
   ];
 
-  cmakeFlags = [
-    "-DBUILD_TESTS=true"
-    "-DRTP_ENABLE_H264=true"
-    "-DRTP_ENABLE_MSDK=true"
-    "-DRTP_ENABLE_VAAPI=true"
-    "-DRTP_ENABLE_VP9=true"
-    "-DVERSION_FOUND=true"
-    "-DVERSION_IS_RELEASE=true"
-    "-DVERSION_FULL=${finalAttrs.version}"
-    "-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext"
-    "-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt"
-    "-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources"
-    "-DSOUP_VERSION=${lib.versions.major libsoup_2_4.version}"
+  doCheck = true;
+
+  mesonFlags = [
+    "-Dplugin-notification-sound=enabled"
+    "-Dplugin-rtp-h264=enabled"
+    "-Dplugin-rtp-msdk=enabled"
+    "-Dplugin-rtp-vaapi=enabled"
+    "-Dplugin-rtp-vp9=enabled"
   ];
 
   # Undefined symbols for architecture arm64: "_gpg_strerror"
   NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lgpg-error";
 
-  doCheck = true;
-  checkPhase = ''
-    runHook preCheck
-    ./xmpp-vala-test
-    ./signal-protocol-vala-test
-    runHook postCheck
-  '';
-
   # Dino looks for plugins with a .so filename extension, even on macOS where
   # .dylib is appropriate, and despite the fact that it builds said plugins with
   # that as their filename extension

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   obs-studio,
-  webkitgtk_4_0,
+  webkitgtk_4_1,
   glib-networking,
   meson,
   cmake,
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     obs-studio
-    webkitgtk_4_0
+    webkitgtk_4_1
     glib-networking
   ];
 

diff --git a/pkgs/by-name/ap/apache-directory-studio/package.nix b/pkgs/by-name/ap/apache-directory-studio/package.nix
@@ -8,7 +8,7 @@
   makeDesktopItem,
   glib,
   libsecret,
-  webkitgtk_4_0,
+  webkitgtk_4_1,
 }:
 
 stdenv.mkDerivation rec {
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
         --prefix LD_LIBRARY_PATH : ${
           lib.makeLibraryPath [
             glib
-            webkitgtk_4_0
+            webkitgtk_4_1
           ]
         } \
         --run "mkdir -p /tmp/SWT-GDBusServer"