Merge staging-next into staging

doc/build-helpers/fetchers.chapter.md

@@ -855,9 +855,11 @@ Used with Mercurial. Expects `url`, `rev`, `hash`, overridable with [`<pkg>.over
 
 A number of fetcher functions wrap part of `fetchurl` and `fetchzip`. They are mainly convenience functions intended for commonly used destinations of source code in Nixpkgs. These wrapper fetchers are listed below.
 
-## `fetchFromGitea` {#fetchfromgitea}
+## `fetchFromGitea`, `fetchFromForgejo` and `fetchFromCodeberg` {#fetchfromgitea}
 
-`fetchFromGitea` expects five arguments. `domain` is the gitea server name. `owner` is a string corresponding to the Gitea user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every Gitea HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `hash` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `hash` is currently preferred.
+`fetchFromGitea`, also aliased to `fetchFromForgejo`, expects five arguments. `domain` is the Gitea/Forgejo server name. `owner` is a string corresponding to the user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every Gitea/Forgejo HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `hash` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `hash` is currently preferred.
+
+As <codeberg.org> is currently the most popular public Forgejo server, the `fetchFromCodeberg` fetcher is also available, which pre-fills the `domain` attribute.
 
 ## `fetchFromGitHub` {#fetchfromgithub}
 

maintainers/maintainer-list.nix

@@ -26222,6 +26222,12 @@
     githubId = 18369995;
     keys = [ { fingerprint = "3D8C A43C FBA2 5D28 0196  19F0 AB11 0475 B417 291D"; } ];
   };
+  theconcierge = {
+    name = "TheConcierge";
+    email = "therealconcierge@proton.me";
+    github = "TheConcierge";
+    githubId = 10949861;
+  };
   thedavidmeister = {
     email = "thedavidmeister@gmail.com";
     github = "thedavidmeister";

maintainers/team-list.nix

@@ -566,6 +566,7 @@ with lib.maintainers;
       ethancedwards8
       fricklerhandwerk
       OPNA2608
+      phanirithvij
       prince213
       wegank
     ];

nixos/modules/security/pam.nix

@@ -2249,7 +2249,7 @@ in
       };
     };
 
-    security.pam.enableUMask = lib.mkEnableOption "umask PAM module";
+    security.pam.enableUMask = lib.mkEnableOption "the umask PAM module";
 
     security.pam.enableFscrypt = lib.mkEnableOption ''
       fscrypt, to automatically unlock directories with the user's login password.

nixos/modules/services/security/reaction.nix

@@ -204,7 +204,6 @@ in
     with lib.maintainers;
     [
       ppom
-      phanirithvij
     ]
     ++ lib.teams.ngi.members;
 }

nixos/tests/reaction-firewall.nix

@@ -73,7 +73,6 @@
     with lib.maintainers;
     [
       ppom
-      phanirithvij
     ]
     ++ lib.teams.ngi.members;
 }

nixos/tests/reaction.nix

@@ -104,7 +104,6 @@
     with lib.maintainers;
     [
       ppom
-      phanirithvij
     ]
     ++ lib.teams.ngi.members;
 }

pkgs/applications/audio/lmms/default.nix

@@ -1,9 +1,11 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   fetchpatch,
   cmake,
   pkg-config,
+  wrapQtAppsHook,
   alsa-lib ? null,
   carla ? null,
   fftwFloat,
@@ -22,10 +24,9 @@
   qtx11extras,
   qttools,
   SDL ? null,
-  mkDerivation,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "lmms";
   version = "1.2.2";
 
@@ -41,6 +42,7 @@ mkDerivation rec {
     cmake
     qttools
     pkg-config
+    wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/applications/audio/sfxr-qt/default.nix

@@ -1,9 +1,10 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   cmake,
   extra-cmake-modules,
+  wrapQtAppsHook,
   qtbase,
   qtquickcontrols2,
   SDL,
@@ -13,7 +14,7 @@
   nixosTests,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "sfxr-qt";
   version = "1.5.1";
 
@@ -35,6 +36,7 @@ mkDerivation rec {
         setuptools
       ]
     ))
+    wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/applications/editors/notepadqq/default.nix

@@ -1,18 +1,19 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitHub,
   pkg-config,
   which,
+  qttools,
+  wrapQtAppsHook,
   libuchardet,
   qtbase,
   qtsvg,
-  qttools,
   qtwebengine,
   qtwebsockets,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "notepadqq";
   # shipping a beta build as there's no proper release which supports qtwebengine
   version = "2.0.0-beta";
@@ -34,6 +35,7 @@ mkDerivation rec {
     pkg-config
     which
     qttools
+    wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/applications/editors/okteta/default.nix

@@ -1,9 +1,10 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchurl,
   extra-cmake-modules,
   kdoctools,
+  wrapQtAppsHook,
   qtscript,
   kconfig,
   kinit,
@@ -17,7 +18,7 @@
   shared-mime-info,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "okteta";
   version = "0.26.24";
 
@@ -30,6 +31,7 @@ mkDerivation rec {
     qtscript
     extra-cmake-modules
     kdoctools
+    wrapQtAppsHook
   ];
   buildInputs = [ shared-mime-info ];
 

pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix

@@ -1,7 +1,7 @@
 {
   lib,
   vimUtils,
-  fetchFromGitea,
+  fetchFromCodeberg,
   nix-update-script,
   vimPlugins,
 }:
@@ -9,8 +9,7 @@ vimUtils.buildVimPlugin {
   pname = "cmp-async-path";
   version = "0-unstable-2026-01-09";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "FelipeLema";
     repo = "cmp-async-path";
     rev = "9c2374deb32c2bec8b27e928c6f57090e9a875d2";

pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix

@@ -1,15 +1,14 @@
 {
   lib,
   vimUtils,
-  fetchFromGitea,
+  fetchFromCodeberg,
   nix-update-script,
 }:
 vimUtils.buildVimPlugin {
   pname = "zig.vim";
   version = "0-unstable-2026-01-16";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "ziglang";
     repo = "zig.vim";
     rev = "fc01f73ce0636723a03b784b63a7a89f2f9a84ae";

pkgs/applications/emulators/yabause/default.nix

@@ -1,9 +1,10 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchurl,
   cmake,
   pkg-config,
+  wrapQtAppsHook,
   qtbase,
   qt5,
   libGLU,
@@ -13,7 +14,7 @@
   SDL2 ? null,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "yabause";
   version = "0.9.15";
 
@@ -25,6 +26,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    wrapQtAppsHook
   ];
   buildInputs = [
     qtbase

pkgs/applications/graphics/awesomebump/default.nix

@@ -1,6 +1,6 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchgit,
   qtbase,
   qmake,
@@ -8,6 +8,7 @@
   flex,
   bison,
   qtdeclarative,
+  wrapQtAppsHook,
 }:
 
 let
@@ -20,7 +21,7 @@ let
     fetchSubmodules = true;
   };
 
-  qtnproperty = mkDerivation {
+  qtnproperty = stdenv.mkDerivation {
     name = "qtnproperty";
     inherit src;
     sourceRoot = "${src.name}/Sources/utils/QtnProperty";
@@ -34,13 +35,14 @@ let
       qmake
       flex
       bison
+      wrapQtAppsHook
     ];
     postInstall = ''
       install -D bin-linux/QtnPEG $out/bin/QtnPEG
     '';
   };
 in
-mkDerivation {
+stdenv.mkDerivation {
   pname = "awesomebump";
   inherit version;
 
@@ -52,7 +54,10 @@ mkDerivation {
     qtdeclarative
   ];
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [
+    qmake
+    wrapQtAppsHook
+  ];
 
   preBuild = ''
     ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG

pkgs/applications/graphics/unigine-superposition/default.nix

@@ -20,7 +20,6 @@
   libXrender,
   autoPatchelfHook,
   makeWrapper,
-  mkDerivation,
   xkeyboard_config,
   fetchurl,
   buildFHSEnv,

pkgs/applications/misc/cask-server/default.nix

@@ -1,12 +1,13 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   cmake,
   extra-cmake-modules,
+  wrapQtAppsHook,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "cask-server";
   version = "0.6.0";
 
@@ -20,6 +21,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
+    wrapQtAppsHook
   ];
 
   meta = {

pkgs/applications/misc/confclerk/default.nix

@@ -1,12 +1,13 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchurl,
   qtbase,
   qmake,
+  wrapQtAppsHook,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "confclerk";
   version = "0.7.2";
 
@@ -16,7 +17,11 @@ mkDerivation rec {
   };
 
   buildInputs = [ qtbase ];
-  nativeBuildInputs = [ qmake ];
+
+  nativeBuildInputs = [
+    qmake
+    wrapQtAppsHook
+  ];
 
   postInstall = ''
     mkdir -p $out/bin

pkgs/applications/misc/coolreader/default.nix

@@ -1,9 +1,9 @@
 {
   stdenv,
-  mkDerivation,
   fetchFromGitHub,
   cmake,
   pkg-config,
+  wrapQtAppsHook,
   lib,
   qttools,
   fribidi,
@@ -11,7 +11,7 @@
   zstd,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "coolreader";
   version = "3.2.58";
 
@@ -27,6 +27,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/applications/misc/cura/default.nix

@@ -1,9 +1,10 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitHub,
   cmake,
   python3,
+  wrapQtAppsHook,
   qtbase,
   qtquickcontrols2,
   qtgraphicaleffects,
@@ -11,7 +12,7 @@
   plugins ? [ ],
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "cura";
   version = "4.13.1";
 
@@ -52,6 +53,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     python3.pkgs.wrapPython
+    wrapQtAppsHook
   ];
 
   cmakeFlags = [

pkgs/applications/misc/ddcui/default.nix

@@ -1,15 +1,16 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   cmake,
   pkg-config,
+  wrapQtAppsHook,
   qtbase,
   qttools,
   ddcutil,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "ddcui";
   version = "0.6.0";
 
@@ -25,6 +26,7 @@ mkDerivation rec {
     # file is not currently written to support PREFIX installations.
     cmake
     pkg-config
+    wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/applications/misc/diffpdf/default.nix

@@ -1,16 +1,16 @@
 {
   lib,
   stdenv,
-  mkDerivation,
   fetchurl,
   fetchpatch,
   qmake,
   qttools,
+  wrapQtAppsHook,
   qtbase,
   poppler,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   version = "2.1.3";
   pname = "diffpdf";
 
@@ -30,6 +30,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     qmake
     qttools
+    wrapQtAppsHook
   ];
   buildInputs = [
     qtbase

pkgs/applications/misc/evtest-qt/default.nix

@@ -1,14 +1,15 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   qtbase,
   cmake,
+  wrapQtAppsHook,
   fetchFromGitHub,
   fetchpatch,
   unstableGitUpdater,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "evtest-qt";
   version = "0.2.0-unstable-2023-09-13";
 
@@ -30,7 +31,10 @@ mkDerivation {
     })
   ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    wrapQtAppsHook
+  ];
 
   buildInputs = [ qtbase ];
 

pkgs/applications/misc/googleearth-pro/default.nix

@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  mkDerivation,
   fetchurl,
   freetype,
   glib,
@@ -30,6 +29,7 @@
 
   xkeyboardconfig,
   autoPatchelfHook,
+  wrapQtAppsHook,
 }:
 let
   arch =
@@ -38,7 +38,7 @@ let
     else
       throw "Unsupported system ${stdenv.hostPlatform.system} ";
 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "googleearth-pro";
   version = "7.3.6.10201";
 
@@ -51,6 +51,7 @@ mkDerivation rec {
     dpkg
     makeWrapper
     autoPatchelfHook
+    wrapQtAppsHook
   ];
   propagatedBuildInputs = [ xkeyboardconfig ];
   buildInputs = [

pkgs/applications/misc/heimer/default.nix

@@ -1,14 +1,15 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   fetchpatch,
   cmake,
+  wrapQtAppsHook,
   qttools,
   qtbase,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "heimer";
   version = "4.5.0";
 
@@ -35,6 +36,7 @@ mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
+    wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/applications/misc/k4dirstat/default.nix

@@ -1,17 +1,18 @@
 {
-  mkDerivation,
-  extra-cmake-modules,
+  lib,
+  stdenv,
   fetchFromGitHub,
+  extra-cmake-modules,
+  wrapQtAppsHook,
   kiconthemes,
   kio,
   kjobwidgets,
   kxmlgui,
-  lib,
   testers,
   k4dirstat,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "k4dirstat";
   version = "3.4.3";
 
@@ -22,7 +23,11 @@ mkDerivation rec {
     hash = "sha256-TXMUtiPS7qRLm6cCy2ZntYrcNJ0fn6X+3o3P5u7oo08=";
   };
 
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [
+    extra-cmake-modules
+    wrapQtAppsHook
+  ];
+
   buildInputs = [
     kiconthemes
     kio

pkgs/applications/misc/klayout/default.nix

@@ -1,9 +1,10 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   python3,
   ruby,
+  wrapQtAppsHook,
   qtbase,
   qtmultimedia,
   qttools,
@@ -11,10 +12,9 @@
   which,
   perl,
   libgit2,
-  stdenv,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "klayout";
   version = "0.30.4-1";
 
@@ -35,6 +35,7 @@ mkDerivation rec {
     perl
     python3
     ruby
+    wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/applications/misc/ksmoothdock/default.nix

@@ -1,14 +1,15 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   cmake,
   extra-cmake-modules,
+  wrapQtAppsHook,
   kactivities,
   qtbase,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "KSmoothDock";
   version = "6.3";
 
@@ -28,6 +29,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
+    wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/applications/misc/lyx/default.nix

@@ -1,18 +1,19 @@
 {
   fetchurl,
   lib,
-  mkDerivation,
+  stdenv,
   pkg-config,
   python3,
   file,
   bc,
   qtbase,
+  wrapQtAppsHook,
   qtsvg,
   hunspell,
   makeWrapper, # , mythes, boost
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   version = "2.4.4";
   pname = "lyx";
 
@@ -27,6 +28,7 @@ mkDerivation rec {
     makeWrapper
     python3
     qtbase
+    wrapQtAppsHook
   ];
   buildInputs = [
     qtbase

pkgs/applications/misc/maliit-framework/default.nix

@@ -1,6 +1,6 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitHub,
   fetchpatch,
 
@@ -25,9 +25,10 @@
   pkg-config,
   wayland-protocols,
   wayland-scanner,
+  wrapQtAppsHook,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "maliit-framework";
   version = "2.3.0-unstable-2024-06-24";
 
@@ -60,6 +61,7 @@ mkDerivation {
     pkg-config
     wayland-protocols
     wayland-scanner
+    wrapQtAppsHook
   ];
 
   cmakeFlags = [

pkgs/applications/misc/maliit-keyboard/default.nix

@@ -1,6 +1,6 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitHub,
 
   anthy,
@@ -16,9 +16,10 @@
   cmake,
   pkg-config,
   wrapGAppsHook3,
+  wrapQtAppsHook,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "maliit-keyboard";
   version = "2.3.1-unstable-2024-09-04";
 
@@ -55,6 +56,7 @@ mkDerivation {
     cmake
     pkg-config
     wrapGAppsHook3
+    wrapQtAppsHook
   ];
 
   postInstall = ''

pkgs/applications/misc/michabo/default.nix

@@ -1,9 +1,10 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   makeDesktopItem,
   fetchFromGitLab,
   qmake,
+  wrapQtAppsHook,
   # qt
   qtbase,
   qtwebsockets,
@@ -17,7 +18,7 @@ let
   };
 
 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "michabo";
   version = "0.1";
 
@@ -31,6 +32,7 @@ mkDerivation rec {
 
   nativeBuildInputs = [
     qmake
+    wrapQtAppsHook
   ];
   buildInputs = [
     qtbase

pkgs/applications/misc/moolticute/default.nix

@@ -1,16 +1,17 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   libusb1,
   pkg-config,
   qmake,
-  qtbase,
   qttools,
+  wrapQtAppsHook,
+  qtbase,
   qtwebsockets,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "moolticute";
   version = "1.03.0";
 
@@ -30,6 +31,7 @@ mkDerivation rec {
     pkg-config
     qmake
     qttools
+    wrapQtAppsHook
   ];
   buildInputs = [
     libusb1

pkgs/applications/misc/nixnote2/default.nix

@@ -1,17 +1,18 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
+  qmake,
+  wrapQtAppsHook,
   boost,
   qtbase,
   qtwebkit,
   poppler,
-  qmake,
   hunspell,
   html-tidy,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "nixnote2";
   version = "2.0.2";
 
@@ -22,6 +23,11 @@ mkDerivation rec {
     sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr";
   };
 
+  nativeBuildInputs = [
+    qmake
+    wrapQtAppsHook
+  ];
+
   buildInputs = [
     boost
     qtbase
@@ -30,8 +36,6 @@ mkDerivation rec {
     hunspell
   ];
 
-  nativeBuildInputs = [ qmake ];
-
   postPatch = ''
     # Fix location of poppler-qt5.h
     for f in threads/indexrunner.cpp html/noteformatter.cpp utilities/noteindexer.cpp gui/plugins/popplerviewer.h gui/plugins/pluginfactory.h gui/plugins/popplerviewer.cpp ; do

pkgs/applications/misc/openambit/default.nix

@@ -1,17 +1,18 @@
 {
+  stdenv,
   cmake,
   fetchFromGitHub,
   fetchpatch,
   lib,
   libusb1,
-  mkDerivation,
   python3,
   qtbase,
   qttools,
+  wrapQtAppsHook,
   udev,
   zlib,
 }:
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "openambit";
   version = "0.5";
 
@@ -49,6 +50,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     qttools
+    wrapQtAppsHook
   ];
   buildInputs = [
     libusb1

pkgs/applications/misc/openbrf/default.nix

@@ -1,19 +1,19 @@
 {
-  mkDerivation,
   lib,
   stdenv,
   fetchFromGitHub,
   fetchpatch,
+  qmake,
+  wrapQtAppsHook,
   qtbase,
   vcg,
   glew,
-  qmake,
   libGLU,
   eigen,
   libGL,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "openbrf";
   version = "unstable-2016-01-09";
 
@@ -33,6 +33,11 @@ mkDerivation {
     })
   ];
 
+  nativeBuildInputs = [
+    qmake
+    wrapQtAppsHook
+  ];
+
   buildInputs = [
     qtbase
     vcg
@@ -40,8 +45,6 @@ mkDerivation {
     eigen
   ];
 
-  nativeBuildInputs = [ qmake ];
-
   qmakeFlags = [ "openBrf.pro" ];
 
   env.NIX_CFLAGS_COMPILE = "-isystem ${lib.getDev eigen}/include/eigen3";

pkgs/applications/misc/opentx/default.nix

@@ -1,21 +1,22 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   cmake,
   gcc-arm-embedded,
   python3Packages,
+  qttools,
+  udevCheckHook,
+  wrapQtAppsHook,
   qtbase,
   qtmultimedia,
-  qttools,
   SDL,
   gtest,
   dfu-util,
   avrdude,
-  udevCheckHook,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "opentx";
   version = "2.3.15";
 
@@ -36,6 +37,7 @@ mkDerivation rec {
     python3Packages.pillow
     qttools
     udevCheckHook
+    wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/applications/misc/pure-maps/default.nix

@@ -1,9 +1,10 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   cmake,
   qttools,
+  wrapQtAppsHook,
   kirigami2,
   qtquickcontrols2,
   qtlocation,
@@ -15,7 +16,7 @@
   pyotherside,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "pure-maps";
   version = "3.4.2";
 
@@ -32,6 +33,7 @@ mkDerivation rec {
     python3
     qttools
     python3.pkgs.wrapPython
+    wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/applications/misc/qlcplus/default.nix

@@ -1,9 +1,11 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   qmake,
   pkg-config,
+  udevCheckHook,
+  wrapQtAppsHook,
   udev,
   qtmultimedia,
   qtscript,
@@ -15,10 +17,9 @@
   libusb-compat-0_1,
   libsndfile,
   libmad,
-  udevCheckHook,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "qlcplus";
   version = "5.0.0";
 
@@ -33,6 +34,7 @@ mkDerivation rec {
     qmake
     pkg-config
     udevCheckHook
+    wrapQtAppsHook
   ];
   buildInputs = [
     udev

pkgs/applications/misc/qsudo/default.nix

@@ -1,13 +1,14 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   qmake,
+  wrapQtAppsHook,
   qtbase,
   sudo,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "qsudo";
   version = "2020.03.27";
 
@@ -22,6 +23,7 @@ mkDerivation rec {
 
   nativeBuildInputs = [
     qmake
+    wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/applications/misc/qsyncthingtray/default.nix

@@ -1,20 +1,20 @@
 {
-  mkDerivation,
   stdenv,
   lib,
   fetchFromGitHub,
   fetchpatch,
+  cmake,
+  wrapQtAppsHook,
   procps,
   qtbase,
   qtwebengine,
   qtwebkit,
-  cmake,
   syncthing,
   preferQWebView ? false,
   preferNative ? true,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   version = "0.5.8";
   pname = "qsyncthingtray";
 
@@ -25,14 +25,17 @@ mkDerivation rec {
     sha256 = "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w";
   };
 
+  nativeBuildInputs = [
+    cmake
+    wrapQtAppsHook
+  ];
+
   buildInputs = [
     qtbase
     qtwebengine
   ]
   ++ lib.optional preferQWebView qtwebkit;
 
-  nativeBuildInputs = [ cmake ];
-
   cmakeFlags =
     [ ]
     ++ lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1"

pkgs/applications/misc/qt-box-editor/default.nix

@@ -1,15 +1,16 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitHub,
+  qmake,
+  wrapQtAppsHook,
   qtbase,
   qtsvg,
-  qmake,
   leptonica,
   tesseract4,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "qt-box-editor";
   version = "unstable-2019-07-14";
 
@@ -20,6 +21,11 @@ mkDerivation {
     hash = "sha256-3dWnAu0CLO3atjbC1zJEnL3vzsIEecDDDhW3INMfCv4=";
   };
 
+  nativeBuildInputs = [
+    qmake
+    wrapQtAppsHook
+  ];
+
   buildInputs = [
     qtbase
     qtsvg
@@ -27,8 +33,6 @@ mkDerivation {
     tesseract4
   ];
 
-  nativeBuildInputs = [ qmake ];
-
   # https://github.com/zdenop/qt-box-editor/issues/87
   postPatch = ''
     sed -i '/allheaders.h/a#include <leptonica/pix_internal.h>' src/TessTools.h

pkgs/applications/misc/rescuetime/default.nix

@@ -3,12 +3,12 @@
   lib,
   fetchurl,
   dpkg,
+  wrapQtAppsHook,
   patchelf,
   qt5,
   libXtst,
   libXext,
   libX11,
-  mkDerivation,
   libXScrnSaver,
   writeScript,
   common-updater-scripts,
@@ -32,12 +32,15 @@ let
         sha256 = "09ng0yal66d533vzfv27k9l2va03rqbqmsni43qi3hgx7w9wx5ii";
       };
 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
   # https://www.rescuetime.com/updates/linux_release_notes.html
   inherit version;
   pname = "rescuetime";
   inherit src;
-  nativeBuildInputs = [ dpkg ];
+  nativeBuildInputs = [
+    dpkg
+    wrapQtAppsHook
+  ];
   # avoid https://github.com/NixOS/patchelf/issues/99
   dontStrip = true;
 

pkgs/applications/misc/rsibreak/default.nix

@@ -1,9 +1,10 @@
 {
-  mkDerivation,
   fetchurl,
   lib,
+  stdenv,
   extra-cmake-modules,
   kdoctools,
+  wrapQtAppsHook,
   knotifyconfig,
   kidletime,
   kwindowsystem,
@@ -11,7 +12,7 @@
   kcrash,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "rsibreak";
   version = "0.12.13";
 
@@ -23,6 +24,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    wrapQtAppsHook
   ];
   propagatedBuildInputs = [
     knotifyconfig

pkgs/applications/misc/twmn/default.nix

@@ -1,14 +1,15 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
-  qtbase,
   qmake,
   pkg-config,
+  wrapQtAppsHook,
+  qtbase,
   boost,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "twmn";
   version = "2025_10_23";
 
@@ -22,6 +23,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     pkg-config
     qmake
+    wrapQtAppsHook
   ];
   buildInputs = [
     qtbase

pkgs/applications/networking/browsers/librewolf/src.nix

@@ -1,17 +1,16 @@
 {
   lib,
   fetchurl,
-  fetchFromGitea,
+  fetchFromCodeberg,
 }:
 let
   src = lib.importJSON ./src.json;
 in
 {
   inherit (src) packageVersion;
-  source = fetchFromGitea (
+  source = fetchFromCodeberg (
     src.source
     // {
-      domain = "codeberg.org";
       owner = "librewolf";
       repo = "source";
       fetchSubmodules = true;

pkgs/applications/networking/datovka/default.nix

@@ -1,17 +1,18 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchurl,
+  pkg-config,
+  wrapQtAppsHook,
   libxml2,
   libdatovka,
   qmake,
   qtbase,
   qtwebsockets,
   qtsvg,
-  pkg-config,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "datovka";
   version = "4.26.0";
 
@@ -20,6 +21,11 @@ mkDerivation rec {
     sha256 = "sha256-pEdjh/c4vhirj2R9bYDdi2FL7N9x67kTOyfXiJDzMKE=";
   };
 
+  nativeBuildInputs = [
+    pkg-config
+    wrapQtAppsHook
+  ];
+
   buildInputs = [
     libdatovka
     qmake
@@ -29,8 +35,6 @@ mkDerivation rec {
     qtwebsockets
   ];
 
-  nativeBuildInputs = [ pkg-config ];
-
   meta = {
     description = "Client application for operating Czech government-provided Databox infomation system";
     homepage = "https://www.datovka.cz/";

pkgs/applications/networking/instant-messengers/psi-plus/default.nix

@@ -1,8 +1,9 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   cmake,
+  wrapQtAppsHook,
   qtbase,
   qtmultimedia,
   qtimageformats,
@@ -43,7 +44,7 @@ assert builtins.elem (lib.toLower chatType) [
 
 assert enablePsiMedia -> enablePlugins;
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "psi-plus";
 
   version = "1.5.2115";
@@ -63,6 +64,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     qttools
+    wrapQtAppsHook
   ]
   ++ lib.optionals enablePsiMedia [
     pkg-config

pkgs/applications/networking/instant-messengers/psi/default.nix

@@ -1,9 +1,10 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   cmake,
   qtbase,
+  wrapQtAppsHook,
   qtmultimedia,
   qtx11extras,
   qttools,
@@ -14,7 +15,7 @@
   hunspell,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "psi";
   version = "1.5";
   src = fetchFromGitHub {
@@ -30,6 +31,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     qttools
+    wrapQtAppsHook
   ];
   buildInputs = [
     qtbase

pkgs/applications/networking/instant-messengers/ripcord/default.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchurl,
   makeFontsConf,
   appimageTools,
@@ -9,6 +9,7 @@
   qtmultimedia,
   qtwebsockets,
   qtimageformats,
+  wrapQtAppsHook,
   autoPatchelfHook,
   desktop-file-utils,
   imagemagick,
@@ -23,7 +24,7 @@
   alsa-lib,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "ripcord";
   version = "0.4.29";
 
@@ -44,6 +45,7 @@ mkDerivation rec {
     autoPatchelfHook
     desktop-file-utils
     imagemagick
+    wrapQtAppsHook
   ];
   buildInputs = [
     libsodium

pkgs/applications/networking/instant-messengers/tensor/default.nix

@@ -1,18 +1,18 @@
 {
-  mkDerivation,
   lib,
   stdenv,
   fetchFromGitHub,
+  qmake,
+  wrapQtAppsHook,
   qtbase,
   qtquickcontrols,
-  qmake,
   makeDesktopItem,
 }:
 
 # we now have libqmatrixclient so a future version of tensor that supports it
 # should use that
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "tensor";
   version = "unstable-2017-02-21";
 
@@ -24,11 +24,15 @@ mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  nativeBuildInputs = [
+    qmake
+    wrapQtAppsHook
+  ];
+
   buildInputs = [
     qtbase
     qtquickcontrols
   ];
-  nativeBuildInputs = [ qmake ];
 
   desktopItem = makeDesktopItem {
     name = "tensor";

pkgs/applications/networking/instant-messengers/twinkle/default.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   cmake,
   libxml2,
@@ -16,11 +17,11 @@
   alsa-lib,
   speex,
   ilbc,
-  mkDerivation,
   bcg729,
+  wrapQtAppsHook,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "twinkle";
   version = "unstable-2024-20-11";
 
@@ -51,6 +52,7 @@ mkDerivation rec {
     bison
     flex
     bcg729
+    wrapQtAppsHook
   ];
 
   cmakeFlags = [

pkgs/applications/networking/irc/kvirc/default.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   qtbase,
   qtmultimedia,
@@ -9,9 +9,10 @@
   pkg-config,
   cmake,
   gettext,
+  wrapQtAppsHook,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "kvirc";
   version = "2022-06-29";
 
@@ -33,6 +34,7 @@ mkDerivation {
     pkg-config
     cmake
     gettext
+    wrapQtAppsHook
   ];
 
   meta = {

pkgs/applications/networking/irc/quassel/default.nix

@@ -10,8 +10,8 @@
   fetchFromGitHub,
   cmake,
   makeWrapper,
+  wrapQtAppsHook,
   dconf,
-  mkDerivation,
   qtbase,
   boost,
   zlib,
@@ -45,7 +45,7 @@ let
   edf = flag: feature: [ ("-D" + feature + (if flag then "=ON" else "=OFF")) ];
 
 in
-(if !buildClient then stdenv.mkDerivation else mkDerivation) rec {
+stdenv.mkDerivation rec {
   pname = "quassel${tag}";
   version = "0.14.0";
 
@@ -62,7 +62,8 @@ in
   nativeBuildInputs = [
     cmake
     makeWrapper
-  ];
+  ]
+  ++ lib.optional buildClient wrapQtAppsHook;
   buildInputs = [
     qtbase
     boost

pkgs/applications/networking/ostinato/default.nix

@@ -1,9 +1,11 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   fetchurl,
   qmake,
+  copyDesktopItems,
+  wrapQtAppsHook,
   makeDesktopItem,
   qtbase,
   qtscript,
@@ -14,10 +16,9 @@
   diffutils,
   gawk,
   libnl,
-  copyDesktopItems,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "ostinato";
   version = "1.3.0";
 
@@ -44,6 +45,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     copyDesktopItems
     qmake
+    wrapQtAppsHook
   ];
 
   patches = [ ./drone_ini.patch ];

pkgs/applications/networking/p2p/eiskaltdcpp/default.nix

@@ -5,9 +5,9 @@
   fetchpatch2,
   cmake,
   pkg-config,
+  wrapQtAppsHook,
   bzip2,
   libX11,
-  mkDerivation,
   qtbase,
   qttools,
   qtmultimedia,
@@ -22,7 +22,7 @@
   perl,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "eiskaltdcpp";
   version = "2.4.2";
 
@@ -43,6 +43,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    wrapQtAppsHook
   ];
   buildInputs = [
     qtbase

pkgs/applications/networking/p2p/retroshare/default.nix

@@ -1,11 +1,12 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   fetchpatch2,
   qmake,
   cmake,
   pkg-config,
+  wrapQtAppsHook,
   miniupnpc,
   bzip2,
   speex,
@@ -21,7 +22,7 @@
   libgnome-keyring,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "retroshare";
   version = "0.6.7.2";
 
@@ -51,6 +52,7 @@ mkDerivation rec {
     pkg-config
     qmake
     cmake
+    wrapQtAppsHook
   ];
   buildInputs = [
     speex

pkgs/applications/networking/remote/teamviewer/default.nix

@@ -1,5 +1,4 @@
 {
-  mkDerivation,
   lib,
   stdenv,
   fetchurl,
@@ -23,7 +22,7 @@
   minizip,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "teamviewer";
   # teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime
   outputs = [

pkgs/applications/office/mytetra/default.nix

@@ -1,14 +1,15 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   qmake,
   qtsvg,
   makeWrapper,
+  wrapQtAppsHook,
   xdg-utils,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "mytetra";
   version = "1.44.183";
 
@@ -22,6 +23,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     qmake
     makeWrapper
+    wrapQtAppsHook
   ];
   buildInputs = [ qtsvg ];
 

pkgs/applications/office/qpdfview/default.nix

@@ -1,12 +1,13 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchurl,
   qmake,
-  qtbase,
   qttools,
-  qtsvg,
   pkg-config,
+  wrapQtAppsHook,
+  qtbase,
+  qtsvg,
   poppler,
   djvulibre,
   libspectre,
@@ -15,7 +16,7 @@
   ghostscript,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "qpdfview";
   version = "0.5.0";
 
@@ -28,6 +29,7 @@ mkDerivation rec {
     qmake
     qttools
     pkg-config
+    wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/applications/office/semantik/default.nix

@@ -1,10 +1,11 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitLab,
   wafHook,
   pkg-config,
   cmake,
+  wrapQtAppsHook,
   qtbase,
   python3,
   qtwebengine,
@@ -23,7 +24,7 @@
   kdelibs4support,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "semantik";
   version = "1.2.10";
 
@@ -66,6 +67,7 @@ mkDerivation rec {
     pkg-config
     wafHook
     cmake
+    wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/applications/radio/pothos/default.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   fetchpatch,
   cmake,
@@ -20,7 +20,7 @@
   python3,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "pothos";
   version = "0.7.1";
 

pkgs/applications/radio/qsstv/default.nix

@@ -1,11 +1,12 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchurl,
   qtbase,
   qmake,
   openjpeg,
   pkg-config,
+  wrapQtAppsHook,
   fftw,
   libpulseaudio,
   alsa-lib,
@@ -14,7 +15,7 @@
   fftwFloat,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   version = "9.5.8";
   pname = "qsstv";
 
@@ -26,6 +27,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     qmake
     pkg-config
+    wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/applications/science/electronics/eagle/eagle.nix

@@ -1,8 +1,8 @@
 {
   lib,
   stdenv,
-  mkDerivation,
   fetchurl,
+  wrapQtAppsHook,
   makeDesktopItem,
   libXrender,
   libXrandr,
@@ -48,7 +48,7 @@ let
     qtwebengine
   ];
 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "eagle";
   version = "9.6.2";
 
@@ -69,6 +69,8 @@ mkDerivation rec {
     categories = [ "Development" ];
   };
 
+  nativeBuildInputs = [ wrapQtAppsHook ];
+
   buildInputs = [
     libXrender
     libXrandr

pkgs/applications/science/electronics/openhantek6022/default.nix

@@ -1,9 +1,10 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitHub,
   makeWrapper,
   cmake,
+  wrapQtAppsHook,
   qtbase,
   qttools,
   fftw,
@@ -11,7 +12,7 @@
   libglvnd,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "openhantek6022";
   version = "3.4.0";
 
@@ -25,6 +26,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     makeWrapper
+    wrapQtAppsHook
   ];
   buildInputs = [
     fftw

pkgs/applications/science/physics/xflr5/default.nix

@@ -1,11 +1,12 @@
 {
-  mkDerivation,
   lib,
-  qmake,
+  stdenv,
   fetchsvn,
+  qmake,
+  wrapQtAppsHook,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "xflr5";
   version = "6.61";
 
@@ -16,7 +17,10 @@ mkDerivation rec {
     sha256 = "sha256-Uj6R15OT5i5tAJEYWqyFyN5Z51Wz5RjO26mWC3Y6QAI=";
   };
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [
+    qmake
+    wrapQtAppsHook
+  ];
 
   meta = {
     description = "Analysis tool for airfoils, wings and planes";

pkgs/applications/science/robotics/apmplanner2/default.nix

@@ -1,8 +1,9 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   qmake,
+  wrapQtAppsHook,
   qtbase,
   qtscript,
   qtwebkit,
@@ -18,7 +19,7 @@
   SDL2,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "apmplanner2";
   version = "2.0.28";
 
@@ -29,6 +30,11 @@ mkDerivation rec {
     sha256 = "0wvbfjnnf7sh6fpgw8gimh5hgzywj3nwrgr80r782f5gayd3v2l1";
   };
 
+  nativeBuildInputs = [
+    qmake
+    wrapQtAppsHook
+  ];
+
   buildInputs = [
     alsa-lib
     libsndfile
@@ -45,8 +51,6 @@ mkDerivation rec {
     qtquickcontrols2
   ];
 
-  nativeBuildInputs = [ qmake ];
-
   qmakeFlags = [ "apm_planner.pro" ];
 
   # this ugly hack is necessary, as `bin/apmplanner2` needs the contents of `share/APMPlanner2` inside of `bin/`

pkgs/applications/search/recoll/default.nix

@@ -2,7 +2,6 @@
   stdenv,
   fetchurl,
   lib,
-  mkDerivation,
   antiword,
   aspell,
   bison,
@@ -32,6 +31,7 @@
   python3Packages,
   qtbase,
   qttools,
+  wrapQtAppsHook,
   unrtf,
   untex,
   unzip,
@@ -73,7 +73,7 @@ let
   useInotify = if stdenv.hostPlatform.isLinux then "true" else "false";
 in
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "recoll";
   version = "1.43.9";
 
@@ -120,6 +120,7 @@ mkDerivation rec {
     ninja
     pkg-config
     which
+    wrapQtAppsHook
   ]
   ++ lib.optionals withGui [
     qtbase

pkgs/applications/video/anilibria-winmaclinux/default.nix

@@ -1,6 +1,6 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitHub,
   qmake,
   pkg-config,
@@ -19,7 +19,7 @@
   mpv-unwrapped,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "anilibria-winmaclinux";
   version = "2.2.32";
 

pkgs/applications/video/clipgrab/default.nix

@@ -1,11 +1,12 @@
 {
   lib,
+  stdenv,
   fetchurl,
   makeDesktopItem,
   ffmpeg,
   qmake,
   qttools,
-  mkDerivation,
+  wrapQtAppsHook,
   qtbase,
   qtdeclarative,
   qtlocation,
@@ -15,7 +16,7 @@
   yt-dlp,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "clipgrab";
   version = "3.9.7";
 
@@ -37,6 +38,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     qmake
     qttools
+    wrapQtAppsHook
   ];
 
   patches = [

pkgs/applications/video/minitube/default.nix

@@ -1,13 +1,14 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitHub,
+  qmake,
+  qttools,
+  wrapQtAppsHook,
   phonon,
   phonon-backend-vlc,
   qtbase,
-  qmake,
   qtdeclarative,
-  qttools,
   qtx11extras,
   mpv,
 
@@ -15,7 +16,7 @@
   withAPIKey ? "AIzaSyBQvZXseEVvgu5Ega_DI-AIJ55v0OsHmVY",
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "minitube";
   version = "3.9.3";
 
@@ -36,6 +37,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     qmake
     qttools
+    wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/applications/video/mythtv/default.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   which,
   qtbase,
@@ -33,6 +33,7 @@
   autoconf,
   automake,
   file,
+  wrapQtAppsHook,
   exiv2,
   linuxHeaders,
   soundtouch,
@@ -41,7 +42,7 @@
   withWebKit ? false,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "mythtv";
   version = "35.0";
 
@@ -98,6 +99,7 @@ mkDerivation rec {
     autoconf
     automake
     file
+    wrapQtAppsHook
   ];
 
   configureFlags = [ "--dvb-path=${linuxHeaders}/include" ];

pkgs/applications/video/qarte/default.nix

@@ -1,7 +1,8 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchbzr,
+  wrapQtAppsHook,
   python3,
   rtmpdump,
 }:
@@ -14,7 +15,7 @@ let
     ]
   );
 in
-mkDerivation {
+stdenv.mkDerivation {
   pname = "qarte";
   version = "5.5.0";
 
@@ -24,6 +25,8 @@ mkDerivation {
     sha256 = "sha256-+Ixe4bWKubH/XBESwmP2NWS8bH0jq611c3MZn7W87Jw=";
   };
 
+  nativeBuildInputs = [ wrapQtAppsHook ];
+
   buildInputs = [ pythonEnv ];
 
   installPhase = ''

pkgs/applications/video/qmediathekview/default.nix

@@ -1,16 +1,16 @@
 {
   lib,
   stdenv,
-  mkDerivation,
   fetchFromGitHub,
   boost,
   qtbase,
   xz,
   qmake,
   pkg-config,
+  wrapQtAppsHook,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "QMediathekView";
   version = "0.2.1";
 
@@ -35,6 +35,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     qmake
     pkg-config
+    wrapQtAppsHook
   ];
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];

pkgs/applications/video/smtube/default.nix

@@ -1,13 +1,14 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchurl,
   qmake,
+  wrapQtAppsHook,
   qtscript,
   qtwebkit,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   version = "21.10.0";
   pname = "smtube";
 
@@ -22,7 +23,10 @@ mkDerivation rec {
 
   dontUseQmakeConfigure = true;
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [
+    qmake
+    wrapQtAppsHook
+  ];
   buildInputs = [
     qtscript
     qtwebkit

pkgs/applications/virtualization/qtemu/default.nix

@@ -1,14 +1,15 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitLab,
   pkg-config,
   qmake,
+  wrapQtAppsHook,
   qtbase,
   qemu,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "qtemu";
   version = "2.1";
 
@@ -22,6 +23,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     qmake
     pkg-config
+    wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix

@@ -125,15 +125,16 @@ let
       unset NIX_ENFORCE_PURITY
       export NIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1
       export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1
-      export NIX_CFLAGS_COMPILE='-idirafter /usr/include'
-      export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32'
-      export NIX_LDFLAGS='-L/usr/lib -L/usr/lib32'
-      export PKG_CONFIG_PATH=/usr/lib/pkgconfig
-      export ACLOCAL_PATH=/usr/share/aclocal
+      export NIX_CFLAGS_COMPILE="-idirafter /usr/include"''${NIX_CFLAGS_COMPILE:+" $NIX_CFLAGS_COMPILE"}
+      export NIX_CFLAGS_LINK="-L/usr/lib -L/usr/lib32"''${NIX_CFLAGS_LINK:+" $NIX_CFLAGS_LINK"}
+      export NIX_LDFLAGS="-L/usr/lib -L/usr/lib32"''${NIX_LDFLAGS:+" $NIX_LDFLAGS"}
+      export PKG_CONFIG_PATH=/usr/lib/pkgconfig''${PKG_CONFIG_PATH:+":$PKG_CONFIG_PATH"}
+      export ACLOCAL_PATH=/usr/share/aclocal''${ACLOCAL_PATH:+":$ACLOCAL_PATH"}
 
       # GStreamer searches for plugins relative to its real binary's location
       # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/bd97973ce0f2c5495bcda5cccd4f7ef7dcb7febc
-      export GST_PLUGIN_SYSTEM_PATH_1_0=/usr/lib/gstreamer-1.0:/usr/lib32/gstreamer-1.0
+      export GST_PLUGIN_SYSTEM_PATH_1_0=/usr/lib/gstreamer-1.0:/usr/lib32/gstreamer-1.0''${GST_PLUGIN_SYSTEM_PATH_1_0:+":$GST_PLUGIN_SYSTEM_PATH_1_0"}
+
 
       ${profile}
     '';

pkgs/build-support/fetchcodeberg/default.nix

@@ -0,0 +1,2 @@
+{ lib, fetchFromGitea }:
+lib.makeOverridable (args: fetchFromGitea ({ domain = "codeberg.org"; } // args))

pkgs/by-name/al/altair/package.nix

@@ -10,7 +10,7 @@ let
   version = "8.5.0";
 
   src = fetchurl {
-    url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
+    url = "https://github.com/altair-graphql/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
     sha256 = "sha256-ImcnV+Z1J+6wGs3HmlCpXmLb/BbyEcunY+IZ2cbD8Ns=";
   };
 
@@ -34,7 +34,7 @@ appimageTools.wrapType2 {
   meta = {
     description = "Feature-rich GraphQL Client IDE";
     mainProgram = "altair";
-    homepage = "https://github.com/imolorhe/altair";
+    homepage = "https://github.com/altair-graphql/altair";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ evalexpr ];
     platforms = [ "x86_64-linux" ];

pkgs/by-name/ar/arcan/sources.nix

@@ -1,6 +1,6 @@
 {
   fetchFromGitHub,
-  fetchFromGitea,
+  fetchFromCodeberg,
 }:
 
 {
@@ -10,8 +10,7 @@
         pname = "arcan";
         version = "0.7.1";
 
-        src = fetchFromGitea {
-          domain = "codeberg.org";
+        src = fetchFromCodeberg {
           owner = "letoram";
           repo = "arcan";
           tag = self.version;

pkgs/by-name/bi/bibiman/package.nix

@@ -1,5 +1,5 @@
 {
-  fetchFromGitea,
+  fetchFromCodeberg,
   lib,
   nix-update-script,
   rustPlatform,
@@ -10,8 +10,7 @@ rustPlatform.buildRustPackage rec {
   pname = "bibiman";
   version = "0.15.0";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "lukeflo";
     repo = "bibiman";
     tag = "v${version}";

pkgs/by-name/bi/biboumi/package.nix

@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchFromGitea,
+  fetchFromCodeberg,
   cmake,
   libuuid,
   expat,
@@ -28,8 +28,7 @@ stdenv.mkDerivation {
   pname = "biboumi";
   version = "9.0-unstable-2025-10-27";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "poezio";
     repo = "biboumi";
     rev = "61242c35bc825d58c9db4301b5696bc17428bf98";

pkgs/by-name/ca/caffeine-ng/package.nix

@@ -1,5 +1,5 @@
 {
-  fetchFromGitea,
+  fetchFromCodeberg,
   meson,
   ninja,
   pkg-config,
@@ -22,8 +22,7 @@ python3Packages.buildPythonApplication rec {
   version = "4.2.0";
   pyproject = false;
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "WhyNotHugo";
     repo = "caffeine-ng";
     rev = "v${version}";

pkgs/by-name/ca/calamares/package.nix

@@ -5,7 +5,7 @@
   writeShellScriptBin,
   xdg-utils,
 
-  fetchFromGitea,
+  fetchFromCodeberg,
 
   cmake,
   ninja,
@@ -38,8 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "calamares";
   version = "3.4.0";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "Calamares";
     repo = "calamares";
     tag = "v${finalAttrs.version}";

pkgs/by-name/ca/cat9/package.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  fetchFromGitea,
+  fetchFromCodeberg,
   stdenvNoCC,
 }:
 
@@ -8,8 +8,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cat9";
   version = "0-unstable-2025-12-26";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "letoram";
     repo = "cat9";
     rev = "8d2b30545c3e87c8f2e161d755b53c23a48bcf05";

pkgs/by-name/ce/censor/package.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  fetchFromGitea,
+  fetchFromCodeberg,
   python3Packages,
   wrapGAppsHook4,
   gobject-introspection,
@@ -16,8 +16,7 @@ python3Packages.buildPythonApplication rec {
   version = "0.3.0";
   pyproject = false;
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "censor";
     repo = "Censor";
     tag = "v${version}";

pkgs/by-name/co/cockatrice/package.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   qt5,
   fetchFromGitHub,
   cmake,
@@ -8,7 +9,7 @@
 let
   protobuf = protobuf_21;
 in
-qt5.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "cockatrice";
   version = "2025-04-03-Release-2.10.2";
 

pkgs/by-name/co/codeberg-cli/package.nix

@@ -1,5 +1,5 @@
 {
-  fetchFromGitea,
+  fetchFromCodeberg,
   installShellFiles,
   lib,
   openssl,
@@ -11,8 +11,7 @@ rustPlatform.buildRustPackage rec {
   pname = "codeberg-cli";
   version = "0.5.4";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "Aviac";
     repo = "codeberg-cli";
     rev = "v${version}";

pkgs/by-name/co/codeberg-pages/package.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  fetchFromGitea,
+  fetchFromCodeberg,
   buildGoModule,
   nix-update-script,
 }:
@@ -9,8 +9,7 @@ buildGoModule rec {
   pname = "codeberg-pages";
   version = "6.4";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "Codeberg";
     repo = "pages-server";
     rev = "v${version}";

pkgs/by-name/co/colorpanes/package.nix

@@ -1,15 +1,14 @@
 {
   lib,
   rustPlatform,
-  fetchFromGitea,
+  fetchFromCodeberg,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "colorpanes";
   version = "3.0.1";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "annaaurora";
     repo = "colorpanes";
     rev = "v${version}";

pkgs/by-name/co/comaps/package.nix

@@ -2,7 +2,7 @@
   lib,
   organicmaps,
   fetchurl,
-  fetchFromGitea,
+  fetchFromCodeberg,
   boost,
   gtest,
   glm,
@@ -38,8 +38,7 @@ organicmaps.overrideAttrs (oldAttrs: rec {
   pname = "comaps";
   version = "2025.11.07-2";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "comaps";
     repo = "comaps";
     tag = "v${version}";

pkgs/by-name/cu/cunicu/package.nix

@@ -2,7 +2,7 @@
   lib,
   stdenv,
   buildGoModule,
-  fetchFromGitea,
+  fetchFromCodeberg,
   installShellFiles,
   versionCheckHook,
   protobuf,
@@ -14,8 +14,7 @@ buildGoModule rec {
   pname = "cunicu";
   version = "0.12.0";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "cunicu";
     repo = "cunicu";
     rev = "v${version}";

pkgs/by-name/cu/curv/package.nix

@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchFromGitea,
+  fetchFromCodeberg,
   cmake,
   git,
   pkg-config,
@@ -29,8 +29,7 @@ stdenv.mkDerivation {
   pname = "curv";
   version = "0.5-unstable-2026-01-23";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "doug-moen";
     repo = "curv";
     rev = "17d03b534c69976ed60936beb8b7cc38e8c12c13";

pkgs/by-name/da/dabet/package.nix

@@ -1,15 +1,14 @@
 {
   lib,
   rustPlatform,
-  fetchFromGitea,
+  fetchFromCodeberg,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "dabet";
   version = "3.0.1";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "annaaurora";
     repo = "dabet";
     rev = "v${version}";

pkgs/by-name/da/dash-mpd-cli/package.nix

@@ -24,16 +24,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dash-mpd-cli";
-  version = "0.2.28";
+  version = "0.2.30";
 
   src = fetchFromGitHub {
     owner = "emarsden";
     repo = "dash-mpd-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Q8+HTDdeaqDroBZ1AS+jDxf0yq20jZ+raRCh7gEJYn8=";
+    hash = "sha256-wFVBHexL0I8eeqWs7V6nS6WFtBVGXQdxuWDCMhFNMJA=";
   };
 
-  cargoHash = "sha256-YnA/LTw9xCLSnNuFDXlsGzAiTdsst2uIDewuohkkgDU=";
+  cargoHash = "sha256-CrSlXfMfJnZBqLqHa4KK/q4eH6TyaayCOBQEhjQClbo=";
 
   nativeBuildInputs = [
     makeWrapper

pkgs/by-name/da/datafusion-cli/package.nix

@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "datafusion-cli";
-  version = "52.0.0";
+  version = "52.1.0";
 
   src = fetchFromGitHub {
     name = "datafusion-cli-source";
     owner = "apache";
     repo = "arrow-datafusion";
     tag = finalAttrs.version;
-    hash = "sha256-IwDDm9Chgep6DxUe0+BT2m6i3s6FVQRcMmLQNcQJRZ8=";
+    hash = "sha256-ViO4Z+8l8hv7gZ1behRlIgV+kdWiGwy+DyaBJrq+gyY=";
   };
 
-  cargoHash = "sha256-t7ADlBSpjlUCrJnXGl44EZobbiQJqc1vaJPcpx4kJvw=";
+  cargoHash = "sha256-KZa4/J7JSOP7TN85fj+QzxUTSMOLcZ+rsjNA/bYU+uU=";
 
   buildAndTestSubdir = "datafusion-cli";
 

pkgs/by-name/de/delfin/package.nix

@@ -4,7 +4,7 @@
   appstream,
   cargo,
   desktop-file-utils,
-  fetchFromGitea,
+  fetchFromCodeberg,
   gitUpdater,
   gtk4,
   libadwaita,
@@ -24,8 +24,7 @@ stdenv.mkDerivation rec {
   pname = "delfin";
   version = "0.4.8";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "avery42";
     repo = "delfin";
     rev = "v${version}";

pkgs/by-name/de/deltatouch/package.nix

@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchFromGitea,
+  fetchFromCodeberg,
   fetchFromGitHub,
   cmake,
   intltool,
@@ -32,8 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "deltatouch";
   version = "2.25.1";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "lk108";
     repo = "deltatouch";
     tag = "v${finalAttrs.version}";

pkgs/by-name/de/dev86/package.nix

@@ -1,15 +1,14 @@
 {
   lib,
   stdenv,
-  fetchFromGitea,
+  fetchFromCodeberg,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dev86";
   version = "1.0.1-unstable-2025-02-12";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "jbruchon";
     repo = "dev86";
     rev = "0332db1ceb238fa7f98603cdf4223a1d839d4b31";

pkgs/by-name/di/didu/package.nix

@@ -1,15 +1,14 @@
 {
   lib,
   rustPlatform,
-  fetchFromGitea,
+  fetchFromCodeberg,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "didu";
   version = "2.5.2";
 
-  src = fetchFromGitea {
-    domain = "codeberg.org";
+  src = fetchFromCodeberg {
     owner = "annaaurora";
     repo = "didu";
     rev = "v${version}";