diff options
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome/misc/gnome-tweaks/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/desktops/plasma-5/default.nix | 8 |
2 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix index 460ab47733c..c220e7eeccd 100644 --- a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix @@ -64,6 +64,16 @@ python3Packages.buildPythonApplication rec { patchShebangs meson-postinstall.py ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = '' + wrapPythonProgramsIn "$out/libexec" "$out $pythonPath" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 7e1bb2b1092..e5a23930888 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -24,9 +24,8 @@ existing packages here and modify it as necessary. */ -{ - libsForQt5, lib, fetchurl, - gconf, gsettings-desktop-schemas +{ libsForQt5, lib, config, fetchurl +, gconf, gsettings-desktop-schemas }: let @@ -123,7 +122,6 @@ let kscreen = callPackage ./kscreen.nix {}; kscreenlocker = callPackage ./kscreenlocker.nix {}; ksshaskpass = callPackage ./ksshaskpass.nix {}; - ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor"; ksystemstats = callPackage ./ksystemstats.nix {}; kwallet-pam = callPackage ./kwallet-pam.nix {}; kwayland-integration = callPackage ./kwayland-integration.nix {}; @@ -164,6 +162,8 @@ let parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { }; }; + } // lib.optionalAttrs (config.allowAliases or true) { + ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor"; }; in lib.makeScope libsForQt5.newScope packages |