From 375df4811eedf202a6770da91af79b54d0e59edc Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 13 Apr 2024 22:37:05 +0800 Subject: [PATCH] treewide: avoid double wrapping with python3Packages and wrapGAppsHook --- pkgs/applications/audio/blanket/default.nix | 6 ++++++ pkgs/applications/audio/easyabc/default.nix | 6 ++++++ pkgs/applications/audio/gpodder/default.nix | 9 ++++++++- pkgs/applications/audio/gspeech/default.nix | 6 ++++++ pkgs/applications/audio/hushboard/default.nix | 6 ++++++ .../audio/indicator-sound-switcher/default.nix | 6 ++++++ pkgs/applications/audio/pithos/default.nix | 6 ++++++ pkgs/applications/audio/quodlibet/default.nix | 6 +++++- pkgs/applications/audio/sonata/default.nix | 6 ++++++ pkgs/applications/audio/soundconverter/default.nix | 6 ++++++ pkgs/applications/audio/sublime-music/default.nix | 6 ++++++ pkgs/applications/editors/formiko/default.nix | 6 ++++++ pkgs/applications/editors/setzer/default.nix | 6 ++++++ pkgs/applications/graphics/drawing/default.nix | 6 ++++++ pkgs/applications/graphics/gscreenshot/default.nix | 6 ++++++ pkgs/applications/graphics/mypaint/default.nix | 6 ++++++ .../graphics/pick-colour-picker/default.nix | 6 ++++++ pkgs/applications/misc/caerbannog/default.nix | 6 ++++++ pkgs/applications/misc/diffuse/default.nix | 11 ++++++++--- pkgs/applications/misc/fluxboxlauncher/default.nix | 13 ++++++++++--- pkgs/applications/misc/kupfer/default.nix | 6 ++++++ .../applications/misc/metadata-cleaner/default.nix | 6 ++++++ pkgs/applications/misc/minigalaxy/default.nix | 6 ++++++ pkgs/applications/misc/nwg-wrapper/default.nix | 2 ++ pkgs/applications/misc/onboard/default.nix | 6 ++++++ pkgs/applications/misc/orca/default.nix | 6 ++++++ pkgs/applications/misc/pdf-quench/default.nix | 6 ++++++ pkgs/applications/misc/polychromatic/default.nix | 2 +- pkgs/applications/misc/pytrainer/default.nix | 13 +++++++++---- pkgs/applications/misc/skytemple/default.nix | 6 ++++++ pkgs/applications/misc/snapper-gui/default.nix | 6 ++++++ pkgs/applications/misc/themechanger/default.nix | 6 ++++++ pkgs/applications/networking/giara/default.nix | 6 ++++++ .../applications/networking/p2p/deluge/default.nix | 6 ++++++ .../networking/protonvpn-gui/default.nix | 6 ++++++ .../networking/protonvpn-gui/legacy.nix | 6 ++++++ pkgs/applications/office/banking/default.nix | 6 ++++++ pkgs/applications/office/gtg/default.nix | 6 ++++++ pkgs/applications/office/pympress/default.nix | 6 ++++++ pkgs/applications/office/tryton/default.nix | 6 ++++++ pkgs/applications/radio/chirp/default.nix | 6 ++++++ pkgs/applications/system/thumbdrives/default.nix | 6 ++++++ .../terminal-emulators/guake/default.nix | 10 +++++++--- .../version-management/meld/default.nix | 6 ++++++ pkgs/applications/video/devede/default.nix | 6 ++++++ pkgs/applications/video/gnomecast/default.nix | 7 ++++++- pkgs/applications/video/kazam/default.nix | 6 ++++++ pkgs/applications/video/pitivi/default.nix | 5 ++++- pkgs/applications/video/tartube/default.nix | 11 ++++++++--- pkgs/by-name/ad/adwsteamgtk/package.nix | 6 ++++++ pkgs/by-name/co/connman-notify/package.nix | 6 ++++++ pkgs/by-name/ed/eduvpn-client/package.nix | 6 ++++++ pkgs/by-name/la/labwc-gtktheme/package.nix | 6 ++++++ pkgs/by-name/me/menulibre/package.nix | 6 ++++++ pkgs/by-name/mo/monophony/package.nix | 5 ++++- pkgs/by-name/ni/nicotine-plus/package.nix | 5 ++++- pkgs/by-name/nw/nwg-hello/package.nix | 6 ++++++ pkgs/by-name/sa/satellite/package.nix | 6 ++++++ pkgs/desktops/mate/mozo/default.nix | 6 ++++++ .../python-modules/controku/default.nix | 6 ++++++ pkgs/development/python-modules/mat2/default.nix | 6 ++++++ .../python-modules/openrazer/daemon.nix | 6 ++++++ .../skytemple-ssb-debugger/default.nix | 6 ++++++ pkgs/development/tools/click/default.nix | 3 +++ pkgs/games/gscrabble/default.nix | 7 +++++-- pkgs/games/gshogi/default.nix | 6 ++++++ pkgs/misc/drivers/sc-controller/default.nix | 7 ++++++- pkgs/misc/solfege/default.nix | 6 ++++++ pkgs/os-specific/linux/piper/default.nix | 6 ++++++ pkgs/os-specific/linux/tuna/default.nix | 6 ++++++ pkgs/tools/X11/arandr/default.nix | 6 ++++++ pkgs/tools/X11/wpgtk/default.nix | 6 ++++++ pkgs/tools/X11/xborders/default.nix | 6 ++++++ pkgs/tools/audio/mpdris2/default.nix | 6 ++++++ pkgs/tools/audio/volctl/default.nix | 7 ++++++- pkgs/tools/games/mymcplus/default.nix | 6 ++++++ pkgs/tools/graphics/escrotum/default.nix | 6 ++++++ .../misc/nautilus-open-any-terminal/default.nix | 6 ++++++ pkgs/tools/misc/system-config-printer/default.nix | 14 ++++++++++---- pkgs/tools/misc/woeusb-ng/default.nix | 6 ++++++ pkgs/tools/networking/gp-saml-gui/default.nix | 5 ++++- pkgs/tools/networking/whatip/default.nix | 6 ++++++ pkgs/tools/security/gnome-keysign/default.nix | 6 ++++++ pkgs/tools/security/onioncircuits/default.nix | 6 ++++++ pkgs/tools/system/cm-rgb/default.nix | 6 ++++++ 85 files changed, 506 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/audio/blanket/default.nix b/pkgs/applications/audio/blanket/default.nix index 4b08f8cf223ae..16eabd3a6efbe 100644 --- a/pkgs/applications/audio/blanket/default.nix +++ b/pkgs/applications/audio/blanket/default.nix @@ -56,6 +56,12 @@ python3Packages.buildPythonApplication rec { --replace gtk-update-icon-cache gtk4-update-icon-cache ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { homepage = "https://github.com/rafaelmardojai/blanket"; description = "Listen to different sounds"; diff --git a/pkgs/applications/audio/easyabc/default.nix b/pkgs/applications/audio/easyabc/default.nix index 9fb792626ac2c..d535b520ac88d 100644 --- a/pkgs/applications/audio/easyabc/default.nix +++ b/pkgs/applications/audio/easyabc/default.nix @@ -71,6 +71,12 @@ in python.pkgs.buildPythonApplication { runHook postInstall ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = { description = "ABC music notation editor"; mainProgram = "easyabc"; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 80f12aa2d0dc7..c591e270fe75c 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -82,7 +82,14 @@ python3Packages.buildPythonApplication rec { LC_ALL=C PYTHONPATH=src/:$PYTHONPATH pytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient --cov=gpodder ''; - makeWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}" ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + "''${gappsWrapperArgs[@]}" + ) + ''; passthru.updateScript = gitUpdater {}; diff --git a/pkgs/applications/audio/gspeech/default.nix b/pkgs/applications/audio/gspeech/default.nix index f2216ed7d2560..609846f63e148 100644 --- a/pkgs/applications/audio/gspeech/default.nix +++ b/pkgs/applications/audio/gspeech/default.nix @@ -60,6 +60,12 @@ python3.pkgs.buildPythonApplication rec { install -Dm444 icons/*.svg -t $out/share/icons/hicolor/scalable/apps ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + postFixup = '' wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts sox ]} wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts sox ]} diff --git a/pkgs/applications/audio/hushboard/default.nix b/pkgs/applications/audio/hushboard/default.nix index 3248ab35b22cb..6fc1bf218e00b 100644 --- a/pkgs/applications/audio/hushboard/default.nix +++ b/pkgs/applications/audio/hushboard/default.nix @@ -63,6 +63,12 @@ buildPythonApplication { # There are no tests doCheck = false; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { homepage = "https://kryogenix.org/code/hushboard/"; license = licenses.mit; diff --git a/pkgs/applications/audio/indicator-sound-switcher/default.nix b/pkgs/applications/audio/indicator-sound-switcher/default.nix index c47aff47fffe5..3dcc50e5a1090 100644 --- a/pkgs/applications/audio/indicator-sound-switcher/default.nix +++ b/pkgs/applications/audio/indicator-sound-switcher/default.nix @@ -52,6 +52,12 @@ python3Packages.buildPythonApplication rec { keybinder3 ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Sound input/output selector indicator for Linux"; mainProgram = "indicator-sound-switcher"; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 1ff4aedb6b00f..5ae0d8159075b 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -31,6 +31,12 @@ pythonPackages.buildPythonApplication rec { (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ (with pythonPackages; [ pygobject3 pylast ]); + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { broken = stdenv.isDarwin; description = "Pandora Internet Radio player for GNOME"; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index f7baad9c53a07..e1f410afca508 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -150,8 +150,12 @@ python3.pkgs.buildPythonApplication rec { runHook postCheck ''; + dontWrapGApps = true; + preFixup = lib.optionalString (kakasi != null) '' - gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin) + makeWrapperArgs+=(--prefix PATH : ${kakasi}/bin) + '' + '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; meta = with lib; { diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 97397da96f259..d7ddcacabe655 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -44,6 +44,12 @@ in buildPythonApplication rec { sed -i '/localmpd/d' sonata/consts.py ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = { description = "An elegant client for the Music Player Daemon"; mainProgram = "sonata"; diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/applications/audio/soundconverter/default.nix index b07ed63f220df..6f2386ba7b3e3 100644 --- a/pkgs/applications/audio/soundconverter/default.nix +++ b/pkgs/applications/audio/soundconverter/default.nix @@ -70,6 +70,12 @@ python3Packages.buildPythonApplication rec { # Necessary to set GDK_PIXBUF_MODULE_FILE. strictDeps = false; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { homepage = "https://soundconverter.org/"; description = "Leading audio file converter for the GNOME Desktop"; diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 2ce12df23dcf6..899585dea4e70 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -116,6 +116,12 @@ python.pkgs.buildPythonApplication rec { done ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "GTK3 Subsonic/Airsonic client"; mainProgram = "sublime-music"; diff --git a/pkgs/applications/editors/formiko/default.nix b/pkgs/applications/editors/formiko/default.nix index 53fee165f5e5a..30d8fc9d488f7 100644 --- a/pkgs/applications/editors/formiko/default.nix +++ b/pkgs/applications/editors/formiko/default.nix @@ -42,6 +42,12 @@ buildPythonApplication rec { # Needs a display doCheck = false; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "reStructuredText editor and live previewer"; homepage = "https://github.com/ondratu/formiko"; diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index e331619d62668..948a32eb4ef52 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -67,6 +67,12 @@ python3.pkgs.buildPythonApplication rec { meson test --print-errorlogs ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "LaTeX editor written in Python with Gtk"; mainProgram = "setzer"; diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index 90caf78d63135..7a2b29270de1e 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -61,6 +61,12 @@ python3.pkgs.buildPythonApplication rec { strictDeps = false; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "A free basic image editor, similar to Microsoft Paint, but aiming at the GNOME desktop"; mainProgram = "drawing"; diff --git a/pkgs/applications/graphics/gscreenshot/default.nix b/pkgs/applications/graphics/gscreenshot/default.nix index b3b9deedffa21..3f963ed5fbad5 100644 --- a/pkgs/applications/graphics/gscreenshot/default.nix +++ b/pkgs/applications/graphics/gscreenshot/default.nix @@ -57,6 +57,12 @@ python3Packages.buildPythonApplication rec { patches = [ ./0001-Changing-paths-to-be-nix-compatible.patch ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = { description = "A screenshot frontend (CLI and GUI) for a variety of screenshot backends"; diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 6381c399315f1..a53321acf3658 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -108,6 +108,12 @@ in buildPythonApplication rec { runHook postCheck ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "A graphics application for digital painters"; homepage = "http://mypaint.org/"; diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix index bd9ab649d6338..f40d2b6397c43 100644 --- a/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -42,6 +42,12 @@ buildPythonPackage rec { gtk3 ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { homepage = "https://kryogenix.org/code/pick/"; license = licenses.mit; diff --git a/pkgs/applications/misc/caerbannog/default.nix b/pkgs/applications/misc/caerbannog/default.nix index 0d21c7e165705..e37ad2eb4f0ff 100644 --- a/pkgs/applications/misc/caerbannog/default.nix +++ b/pkgs/applications/misc/caerbannog/default.nix @@ -50,6 +50,12 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Mobile-friendly Gtk frontend for password-store"; mainProgram = "caerbannog"; diff --git a/pkgs/applications/misc/diffuse/default.nix b/pkgs/applications/misc/diffuse/default.nix index 0f5cf3c0adc1c..53ff6e2273d01 100644 --- a/pkgs/applications/misc/diffuse/default.nix +++ b/pkgs/applications/misc/diffuse/default.nix @@ -58,9 +58,14 @@ python3.pkgs.buildPythonApplication rec { # to avoid running gtk-update-icon-cache, update-desktop-database and glib-compile-schemas DESTDIR = "/"; - makeWrapperArgs = [ - "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" - ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share + ) + ''; passthru = { updateScript = gitUpdater { diff --git a/pkgs/applications/misc/fluxboxlauncher/default.nix b/pkgs/applications/misc/fluxboxlauncher/default.nix index 19e70ad7c54cf..2dd7da851c907 100644 --- a/pkgs/applications/misc/fluxboxlauncher/default.nix +++ b/pkgs/applications/misc/fluxboxlauncher/default.nix @@ -39,9 +39,6 @@ python3.pkgs.buildPythonApplication rec { fluxbox ]; - makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" - "--set CHARSET en_us.UTF-8" ]; - propagatedBuildInputs = with python3.pkgs; [ pygobject3 ]; @@ -51,6 +48,16 @@ python3.pkgs.buildPythonApplication rec { install -Dm444 fluxboxlauncher.svg -t $out/share/icons/hicolor/scalable/apps ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive + --set CHARSET en_us.UTF-8 + ) + ''; + meta = with lib; { description = "A Gui editor (gtk) to configure applications launching on a fluxbox session"; mainProgram = "fluxboxlauncher"; diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index fbb33c7e096fe..744055a11c618 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -50,6 +50,12 @@ buildPythonApplication rec { doCheck = false; # no tests + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "A smart, quick launcher"; homepage = "https://kupferlauncher.github.io/"; diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 24970e7a5832c..c3cc2f7f9fce8 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -55,6 +55,12 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Python GTK application to view and clean metadata in files, using mat2"; mainProgram = "metadata-cleaner"; diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index ad694c01cdcba..49796ddd8218c 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -59,6 +59,12 @@ python3Packages.buildPythonApplication rec { webkitgtk ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + # Run Linux games using the Steam Runtime by using steam-run in the wrapper # FIXME: not working with makeBinaryWrapper postFixup = '' diff --git a/pkgs/applications/misc/nwg-wrapper/default.nix b/pkgs/applications/misc/nwg-wrapper/default.nix index 5b28628318961..c8293fddc975d 100644 --- a/pkgs/applications/misc/nwg-wrapper/default.nix +++ b/pkgs/applications/misc/nwg-wrapper/default.nix @@ -20,6 +20,8 @@ python3Packages.buildPythonPackage rec { # No tests doCheck = false; + dontWrapGApps = true; + preFixup = '' makeWrapperArgs+=( "''${gappsWrapperArgs[@]}" diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index cdcdb2b1e5149..4ad3420500ea6 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -164,6 +164,12 @@ python3.pkgs.buildPythonApplication rec { glib-compile-schemas $out/share/glib-2.0/schemas/ ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + # Remove ubuntu icons. postFixup = '' rm -rf $out/share/icons/ubuntu-mono-* diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 283970a6e75ef..29a45d4b87168 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -89,6 +89,12 @@ buildPythonApplication rec { gst_all_1.gst-plugins-good ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 78151061700aa..72617dc1579a4 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -26,6 +26,12 @@ python3.pkgs.buildPythonApplication { install -D -T -m 755 src/pdf_quench.py $out/bin/pdf-quench ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { homepage = "https://github.com/linuxerwang/pdf-quench"; description = "A visual tool for cropping pdf files"; diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index f940f5a4af803..a17b7e6bbd4ae 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -67,7 +67,7 @@ python3Packages.buildPythonApplication rec { usbutils ]; - dontWrapGapps = true; + dontWrapGApps = true; dontWrapQtApps = true; makeWrapperArgs = [ diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 6d907fab0db46..f88691f33b729 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -60,10 +60,6 @@ in python.pkgs.buildPythonApplication rec { gdk-pixbuf ]; - makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ perl gpsbabel ]) - ]; - nativeCheckInputs = [ glibcLocales perl @@ -88,6 +84,15 @@ in python.pkgs.buildPythonApplication rec { ${python.interpreter} setup.py test ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH : ${lib.makeBinPath [ perl gpsbabel ]} + ) + ''; + meta = with lib; { homepage = "https://github.com/pytrainer/pytrainer"; description = "Application for logging and graphing sporting excursions"; diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index b054be4be0948..1aa60979d3f5e 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -62,6 +62,12 @@ python3Packages.buildPythonApplication rec { install -Dm444 installer/skytemple.ico $out/share/icons/hicolor/256x256/apps/org.skytemple.SkyTemple.ico ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { homepage = "https://github.com/SkyTemple/skytemple"; description = "ROM hacking tool for Pokémon Mystery Dungeon Explorers of Sky"; diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/applications/misc/snapper-gui/default.nix index c82b0813f78ba..41a6f822dce08 100644 --- a/pkgs/applications/misc/snapper-gui/default.nix +++ b/pkgs/applications/misc/snapper-gui/default.nix @@ -32,6 +32,12 @@ python3Packages.buildPythonApplication rec { snapper ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Graphical interface for snapper"; mainProgram = "snapper-gui"; diff --git a/pkgs/applications/misc/themechanger/default.nix b/pkgs/applications/misc/themechanger/default.nix index 652fe267852a9..0543ccabea580 100644 --- a/pkgs/applications/misc/themechanger/default.nix +++ b/pkgs/applications/misc/themechanger/default.nix @@ -50,6 +50,12 @@ python3Packages.buildPythonApplication rec { patchShebangs postinstall.py ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { homepage = "https://github.com/ALEX11BR/ThemeChanger"; description = "A theme changing utility for Linux"; diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/applications/networking/giara/default.nix index 9acbf6f929b98..c4c98237dd875 100644 --- a/pkgs/applications/networking/giara/default.nix +++ b/pkgs/applications/networking/giara/default.nix @@ -67,6 +67,12 @@ python3.pkgs.buildPythonApplication rec { --replace "item { custom: profile; }" 'item { custom: "profile"; }' ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "A Reddit app, built with Python, GTK and Handy; Created with mobile Linux in mind"; maintainers = with maintainers; [ dasj19 ]; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 35db62ef8e4e5..fd802e30c77ff 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -81,6 +81,12 @@ let rm -r $out/share/{icons,man/man1/deluge-gtk*,pixmaps} ''); + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + postFixup = '' for f in $out/lib/systemd/system/*; do substituteInPlace $f --replace /usr/bin $out/bin diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index e273a3242739d..f16d9e68cda19 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -92,6 +92,12 @@ buildPythonApplication rec { # Gets a segmentation fault after the widgets test doCheck = false; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Proton VPN GTK app for Linux"; homepage = "https://github.com/ProtonVPN/proton-vpn-gtk-app"; diff --git a/pkgs/applications/networking/protonvpn-gui/legacy.nix b/pkgs/applications/networking/protonvpn-gui/legacy.nix index 7464a279cf8a9..24841141e9e12 100644 --- a/pkgs/applications/networking/protonvpn-gui/legacy.nix +++ b/pkgs/applications/networking/protonvpn-gui/legacy.nix @@ -68,6 +68,12 @@ buildPythonApplication rec { # Project has a dummy test doCheck = false; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Official ProtonVPN Linux app"; homepage = "https://github.com/ProtonVPN/linux-app"; diff --git a/pkgs/applications/office/banking/default.nix b/pkgs/applications/office/banking/default.nix index 1874521cb0cc4..3eb6de6f69b84 100644 --- a/pkgs/applications/office/banking/default.nix +++ b/pkgs/applications/office/banking/default.nix @@ -59,6 +59,12 @@ python3.pkgs.buildPythonApplication rec { schwifty ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Banking application for small screens"; homepage = "https://tabos.gitlab.io/projects/banking/"; diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index d7bad1d133901..1b96d8bf69162 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -70,6 +70,12 @@ python3Packages.buildPythonApplication rec { checkPhase = "xvfb-run pytest ../tests/"; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = " A personal tasks and TODO-list items organizer"; mainProgram = "gtg"; diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix index 353e46e067dac..ec70f96229f95 100644 --- a/pkgs/applications/office/pympress/default.nix +++ b/pkgs/applications/office/pympress/default.nix @@ -40,6 +40,12 @@ python3Packages.buildPythonApplication rec { doCheck = false; # there are no tests + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Simple yet powerful PDF reader designed for dual-screen presentations"; mainProgram = "pympress"; diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index e1a236e5db8bc..9dee195f9ec38 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -61,6 +61,12 @@ python3Packages.buildPythonApplication rec { doCheck = false; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = { description = "The client of the Tryton application platform"; mainProgram = "tryton"; diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 066c93361899b..0aa8a23e53c77 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -36,6 +36,12 @@ python3.pkgs.buildPythonApplication rec { # "running build_ext" fails with no output doCheck = false; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + passthru.updateScript = unstableGitUpdater { branch = "py3"; }; diff --git a/pkgs/applications/system/thumbdrives/default.nix b/pkgs/applications/system/thumbdrives/default.nix index d70ea95806293..b22f415be4e49 100644 --- a/pkgs/applications/system/thumbdrives/default.nix +++ b/pkgs/applications/system/thumbdrives/default.nix @@ -52,6 +52,12 @@ python3.pkgs.buildPythonApplication rec { pyxdg ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "USB mass storage emulator for Linux handhelds"; homepage = "https://sr.ht/~martijnbraam/thumbdrives/"; diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index 667da3ec229fd..3b72118e48350 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -42,8 +42,6 @@ python3.pkgs.buildPythonApplication rec { vte ]; - makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" ]; - propagatedBuildInputs = with python3.pkgs; [ dbus-python pycairo @@ -56,8 +54,14 @@ python3.pkgs.buildPythonApplication rec { "PREFIX=${placeholder "out"}" ]; + dontWrapGApps = true; + preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libutempter ]}") + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libutempter ]}" + ) ''; passthru.tests.test = nixosTests.terminal-emulators.guake; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 3b2f52f007741..3f14f1900cdf5 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -56,6 +56,12 @@ python3.pkgs.buildPythonApplication rec { patchShebangs meson_shebang_normalisation.py ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 22689e27d6e9a..9132a3288ace1 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -35,6 +35,12 @@ in buildPythonApplication rec { --replace "/usr/local/share" "$out/share" ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "DVD Creator for Linux"; homepage = "http://www.rastersoft.com/programas/devede.html"; diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix index 9d0bfa9e966e3..fd5a1264e45f6 100644 --- a/pkgs/applications/video/gnomecast/default.nix +++ b/pkgs/applications/video/gnomecast/default.nix @@ -29,8 +29,13 @@ buildPythonApplication rec { # https://nixos.org/manual/nixpkgs/stable/#ssec-gnome-hooks-gobject-introspection strictDeps = false; + dontWrapGApps = true; + preFixup = '' - gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}) + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} + ) ''; # no tests diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 8ca3b813663f4..8acfaaba83539 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -52,6 +52,12 @@ python3Packages.buildPythonApplication rec { # no tests doCheck = false; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "A screencasting program created with design in mind"; homepage = "https://github.com/niknah/kazam"; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index eb00353b83d1e..4e61d28578194 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -75,8 +75,11 @@ python3.pkgs.buildPythonApplication rec { librosa ]; + dontWrapGApps = true; + preFixup = '' - gappsWrapperArgs+=( + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" # The icon theme is hardcoded. --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" ) diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index 5b62399a04651..56df50b35c0ff 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -64,9 +64,14 @@ python3Packages.buildPythonApplication rec { doCheck = false; - makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ youtube-dl ]}" - ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH : ${lib.makeBinPath [ youtube-dl ]} + ) + ''; meta = with lib; { description = "A GUI front-end for youtube-dl"; diff --git a/pkgs/by-name/ad/adwsteamgtk/package.nix b/pkgs/by-name/ad/adwsteamgtk/package.nix index 419541b28ed79..7dcdc0bf2ee98 100644 --- a/pkgs/by-name/ad/adwsteamgtk/package.nix +++ b/pkgs/by-name/ad/adwsteamgtk/package.nix @@ -41,6 +41,12 @@ python3Packages.buildPythonApplication rec { pygobject3 ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = { description = "A simple Gtk wrapper for Adwaita-for-Steam"; homepage = "https://github.com/Foldex/AdwSteamGtk"; diff --git a/pkgs/by-name/co/connman-notify/package.nix b/pkgs/by-name/co/connman-notify/package.nix index c8df6bc893527..2f38ad8539115 100644 --- a/pkgs/by-name/co/connman-notify/package.nix +++ b/pkgs/by-name/co/connman-notify/package.nix @@ -26,6 +26,12 @@ python3Packages.buildPythonApplication { install -D -t $out/share/doc README.rst ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Desktop notification integration for connman"; mainProgram = "connman-notify"; diff --git a/pkgs/by-name/ed/eduvpn-client/package.nix b/pkgs/by-name/ed/eduvpn-client/package.nix index e3b5b9d8a04c3..38271e24c1d85 100644 --- a/pkgs/by-name/ed/eduvpn-client/package.nix +++ b/pkgs/by-name/ed/eduvpn-client/package.nix @@ -48,6 +48,12 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { changelog = "https://raw.githubusercontent.com/eduvpn/python-eduvpn-client/${version}/CHANGES.md"; description = "Linux client for eduVPN"; diff --git a/pkgs/by-name/la/labwc-gtktheme/package.nix b/pkgs/by-name/la/labwc-gtktheme/package.nix index dd2e9ca254951..1b44a719e1ea4 100644 --- a/pkgs/by-name/la/labwc-gtktheme/package.nix +++ b/pkgs/by-name/la/labwc-gtktheme/package.nix @@ -41,6 +41,12 @@ python3Packages.buildPythonApplication rec { runHook postInstall ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/pkgs/by-name/me/menulibre/package.nix b/pkgs/by-name/me/menulibre/package.nix index 134c7cc98cc90..dfa8591e6f85b 100644 --- a/pkgs/by-name/me/menulibre/package.nix +++ b/pkgs/by-name/me/menulibre/package.nix @@ -46,6 +46,12 @@ python3Packages.buildPythonApplication rec { export HOME=$TMPDIR ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + passthru = { updateScript = nix-update-script { }; tests.version = testers.testVersion { diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix index f0f268ca14a59..047970718672f 100644 --- a/pkgs/by-name/mo/monophony/package.nix +++ b/pkgs/by-name/mo/monophony/package.nix @@ -46,9 +46,12 @@ python3Packages.buildPythonApplication rec { installFlags = [ "prefix=$(out)" ]; + dontWrapGApps = true; + preFixup = '' buildPythonPath "$pythonPath" - gappsWrapperArgs+=( + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" --prefix PYTHONPATH : "$program_PYTHONPATH" --prefix PATH : "${lib.makeBinPath [yt-dlp]}" ) diff --git a/pkgs/by-name/ni/nicotine-plus/package.nix b/pkgs/by-name/ni/nicotine-plus/package.nix index dad01456ba737..d0b3fd689c8fd 100644 --- a/pkgs/by-name/ni/nicotine-plus/package.nix +++ b/pkgs/by-name/ni/nicotine-plus/package.nix @@ -32,8 +32,11 @@ python3Packages.buildPythonApplication rec { ln -s $out/bin/nicotine $out/bin/nicotine-plus ''; + dontWrapGApps = true; + preFixup = '' - gappsWrapperArgs+=( + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" --prefix XDG_DATA_DIRS : "${gtk4}/share/gsettings-schemas/${gtk4.name}" ) ''; diff --git a/pkgs/by-name/nw/nwg-hello/package.nix b/pkgs/by-name/nw/nwg-hello/package.nix index eb6126d1300ec..b45113370804d 100644 --- a/pkgs/by-name/nw/nwg-hello/package.nix +++ b/pkgs/by-name/nw/nwg-hello/package.nix @@ -56,6 +56,12 @@ python3Packages.buildPythonApplication rec { doCheck = false; pythonImportsCheck = [ "nwg_hello" ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = { homepage = "https://github.com/nwg-piotr/nwg-hello"; description = "GTK3-based greeter for the greetd daemon, written in python"; diff --git a/pkgs/by-name/sa/satellite/package.nix b/pkgs/by-name/sa/satellite/package.nix index ad3afe454b65a..9ababcabceaa2 100644 --- a/pkgs/by-name/sa/satellite/package.nix +++ b/pkgs/by-name/sa/satellite/package.nix @@ -42,6 +42,12 @@ python3.pkgs.buildPythonApplication rec { strictDeps = true; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "A program for showing navigation satellite data"; longDescription = '' diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 66b7048ffecfb..4034b0eb77fd3 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -42,6 +42,12 @@ python3.pkgs.buildPythonApplication rec { enableParallelBuilding = true; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { diff --git a/pkgs/development/python-modules/controku/default.nix b/pkgs/development/python-modules/controku/default.nix index e2dd1d32b76a3..8a6519afb44f3 100644 --- a/pkgs/development/python-modules/controku/default.nix +++ b/pkgs/development/python-modules/controku/default.nix @@ -40,6 +40,12 @@ python3Packages.buildPythonPackage rec { pygobject3 ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + pythonImportsCheck = [ "controku" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 1646d3ac72460..324d7fbb44b5e 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -95,6 +95,12 @@ buildPythonPackage rec { "test_all_parametred" ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "A handy tool to trash your metadata"; homepage = "https://0xacab.org/jvoisin/mat2"; diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix index bf2005d06e5d1..87214d26e98af 100644 --- a/pkgs/development/python-modules/openrazer/daemon.nix +++ b/pkgs/development/python-modules/openrazer/daemon.nix @@ -50,6 +50,12 @@ buildPythonPackage (common // { # no tests run doCheck = false; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = common.meta // { description = "An entirely open source user-space daemon that allows you to manage your Razer peripherals on GNU/Linux"; mainProgram = "openrazer-daemon"; diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index da873a37dc517..cbf5987724dad 100644 --- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -53,6 +53,12 @@ buildPythonPackage rec { doCheck = false; # requires Pokémon Mystery Dungeon ROM pythonImportsCheck = [ "skytemple_ssb_debugger" ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { homepage = "https://github.com/SkyTemple/skytemple-ssb-debugger"; description = "Script Engine Debugger for Pokémon Mystery Dungeon Explorers of Sky"; diff --git a/pkgs/development/tools/click/default.nix b/pkgs/development/tools/click/default.nix index f8d73eec2580f..48cd2dd79205e 100644 --- a/pkgs/development/tools/click/default.nix +++ b/pkgs/development/tools/click/default.nix @@ -39,8 +39,11 @@ buildPythonApplication { "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" ]; + dontWrapGApps = true; + preFixup = '' makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" --prefix LD_LIBRARY_PATH : "$out/lib" ) ''; diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index 28e2a58b0d008..8f89d43bcc51c 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -24,10 +24,13 @@ buildPythonApplication { propagatedBuildInputs = with python3Packages; [ gst-python pygobject3 ]; + dontWrapGApps = true; + preFixup = '' - gappsWrapperArgs+=( + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" --prefix PYTHONPATH : "$out/share/GScrabble/modules" - ) + ) ''; meta = with lib; { diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix index 350ab86aa22b3..3961c18328e1b 100644 --- a/pkgs/games/gshogi/default.nix +++ b/pkgs/games/gshogi/default.nix @@ -30,6 +30,12 @@ python3.pkgs.buildPythonApplication rec { pycairo ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { homepage = "http://johncheetham.com/projects/gshogi/"; description = "A graphical implementation of the Shogi board game, also known as Japanese Chess"; diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index 48783b492387d..7c44f2ee4d948 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -33,8 +33,13 @@ buildPythonApplication rec { LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes libusb1 udev bluez ]; + dontWrapGApps = true; + preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH") + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" + ) ''; postFixup = '' diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 63606078abada..bb6957aaac0f1 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -63,6 +63,12 @@ buildPythonApplication rec { enableParallelBuilding = true; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Ear training program"; homepage = "https://www.gnu.org/software/solfege/"; diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index b1508dcb6a3ed..e29dc4d515ec6 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -31,6 +31,12 @@ python3.pkgs.buildPythonApplication rec { patchShebangs meson_install.sh data/generate-piper-gresource.xml.py ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "GTK frontend for ratbagd mouse config daemon"; mainProgram = "piper"; diff --git a/pkgs/os-specific/linux/tuna/default.nix b/pkgs/os-specific/linux/tuna/default.nix index b57169369ca72..4d4f266ae371d 100644 --- a/pkgs/os-specific/linux/tuna/default.nix +++ b/pkgs/os-specific/linux/tuna/default.nix @@ -51,6 +51,12 @@ buildPythonApplication rec { doCheck = false; pythonImportsCheck = [ "tuna" ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Thread and IRQ affinity setting GUI and cmd line tool"; mainProgram = "tuna"; diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 2535f467771c6..2ec40018af51d 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -31,6 +31,12 @@ buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = [ xrandr pygobject3 ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { homepage = "https://christian.amsuess.com/tools/arandr/"; description = "A simple visual front end for XRandR"; diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 371642cbfa7e3..63a95d818a855 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -37,6 +37,12 @@ python3Packages.buildPythonApplication rec { # No test exist doCheck = false; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Template based wallpaper/colorscheme generator and manager"; longDescription = '' diff --git a/pkgs/tools/X11/xborders/default.nix b/pkgs/tools/X11/xborders/default.nix index 379f976acf451..69cb34c69ccba 100644 --- a/pkgs/tools/X11/xborders/default.nix +++ b/pkgs/tools/X11/xborders/default.nix @@ -47,6 +47,12 @@ python3Packages.buildPythonPackage rec { ln -s ${setup} setup.py ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Active window border replacement for window managers"; homepage = "https://github.com/deter0/xborder"; diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index fd4b60f13e05d..a999be9e8a4f5 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -44,6 +44,12 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "MPRIS 2 support for mpd"; homepage = "https://github.com/eonpatapon/mpDris2/"; diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/tools/audio/volctl/default.nix index 0d33c586ed375..1704371937c13 100644 --- a/pkgs/tools/audio/volctl/default.nix +++ b/pkgs/tools/audio/volctl/default.nix @@ -42,9 +42,14 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "volctl" ]; + dontWrapGApps = true; + preFixup = '' glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${libpulseaudio}/lib") + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix LD_LIBRARY_PATH : "${libpulseaudio}/lib" + ) ''; meta = with lib; { diff --git a/pkgs/tools/games/mymcplus/default.nix b/pkgs/tools/games/mymcplus/default.nix index c94ef8768c07e..f557992943186 100644 --- a/pkgs/tools/games/mymcplus/default.nix +++ b/pkgs/tools/games/mymcplus/default.nix @@ -24,6 +24,12 @@ pythonPackages.buildPythonApplication rec { wxpython ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { homepage = "https://git.sr.ht/~thestr4ng3r/mymcplus"; description = "A PlayStation 2 memory card manager"; diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix index c2e5a7ec9a719..e3dd6571d93dc 100644 --- a/pkgs/tools/graphics/escrotum/default.nix +++ b/pkgs/tools/graphics/escrotum/default.nix @@ -41,6 +41,12 @@ with python3Packages; buildPythonApplication { cp man/escrotum.1 $man/share/man/man1/ ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { homepage = "https://github.com/Roger/escrotum"; description = "Linux screen capture using pygtk, inspired by scrot"; diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix index b200731ab8f24..6e66112b2d5c5 100644 --- a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix +++ b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -53,6 +53,12 @@ python3.pkgs.buildPythonPackage rec { glib-compile-schemas "$out/share/glib-2.0/schemas" ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Extension for nautilus, which adds an context-entry for opening other terminal-emulators then `gnome-terminal`"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index cafc35790193c..cc1e233726598 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -63,10 +63,6 @@ stdenv.mkDerivation rec { postInstall = '' buildPythonPath "$out $pythonPath" - gappsWrapperArgs+=( - --prefix PATH : "$program_PATH" - --set CUPS_DATADIR "${cups-filters}/share/cups" - ) find $out/share/system-config-printer -name \*.py -type f -perm -0100 -print0 | while read -d "" f; do patchPythonScript "$f" @@ -77,6 +73,16 @@ stdenv.mkDerivation rec { --replace "udev-configure-printer" "$out/etc/udev/udev-configure-printer" ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH : "$program_PATH" + --set CUPS_DATADIR "${cups-filters}/share/cups" + ) + ''; + meta = { homepage = "https://github.com/openprinting/system-config-printer"; platforms = lib.platforms.linux; diff --git a/pkgs/tools/misc/woeusb-ng/default.nix b/pkgs/tools/misc/woeusb-ng/default.nix index 821eb73a4a896..39eac333da963 100644 --- a/pkgs/tools/misc/woeusb-ng/default.nix +++ b/pkgs/tools/misc/woeusb-ng/default.nix @@ -46,6 +46,12 @@ buildPythonApplication rec { # Unable to access the X Display, is $DISPLAY set properly? doCheck = false; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "A tool to create a Windows USB stick installer from a real Windows DVD or image"; homepage = "https://github.com/WoeUSB/WoeUSB-ng"; diff --git a/pkgs/tools/networking/gp-saml-gui/default.nix b/pkgs/tools/networking/gp-saml-gui/default.nix index 348d47b667f66..990a17f2792c4 100644 --- a/pkgs/tools/networking/gp-saml-gui/default.nix +++ b/pkgs/tools/networking/gp-saml-gui/default.nix @@ -31,8 +31,11 @@ buildPythonPackage rec { openconnect ] ++ lib.optional stdenv.isLinux webkitgtk; + dontWrapGApps = true; + preFixup = '' - gappsWrapperArgs+=( + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" --set WEBKIT_DISABLE_COMPOSITING_MODE "1" ) ''; diff --git a/pkgs/tools/networking/whatip/default.nix b/pkgs/tools/networking/whatip/default.nix index 85a2fdf3f7b37..94ebac19cf001 100644 --- a/pkgs/tools/networking/whatip/default.nix +++ b/pkgs/tools/networking/whatip/default.nix @@ -53,6 +53,12 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Info on your IP"; mainProgram = "whatip"; diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix index 56ea016eda93d..6c9b851c61b8e 100644 --- a/pkgs/tools/security/gnome-keysign/default.nix +++ b/pkgs/tools/security/gnome-keysign/default.nix @@ -53,6 +53,12 @@ python3.pkgs.buildPythonApplication rec { # bunch of linting doCheck = false; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "GTK/GNOME application to use GnuPG for signing other peoples’ keys"; homepage = "https://wiki.gnome.org/Apps/Keysign"; diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 95692ef1c188c..a87c00af2f0d8 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -47,6 +47,12 @@ python3.pkgs.buildPythonApplication rec { cp apparmor/usr.bin.onioncircuits $out/etc/apparmor.d ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { broken = stdenv.isDarwin; homepage = "https://tails.boum.org"; diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/tools/system/cm-rgb/default.nix index adc291d4f85d5..3c2e3a720dee5 100644 --- a/pkgs/tools/system/cm-rgb/default.nix +++ b/pkgs/tools/system/cm-rgb/default.nix @@ -42,6 +42,12 @@ buildPythonApplication rec { > $out/etc/udev/rules.d/60-cm-rgb.rules ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Control AMD Wraith Prism RGB LEDs"; longDescription = ''