Merge pull request #21466 from abbradar/kde-wrapper

Flatten nested kdeWrappers

nixos/modules/services/x11/desktop-managers/kde5.nix

@@ -31,12 +31,25 @@ in
         '';
       };
 
+      extraPackages = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        description = ''
+          KDE packages that need to be installed system-wide.
+        '';
+      };
+
     };
 
   };
 
 
-  config = mkIf (xcfg.enable && cfg.enable) {
+  config = mkMerge [
+    (mkIf (cfg.extraPackages != []) {
+      environment.systemPackages = [ (kde5.kdeWrapper cfg.extraPackages) ];
+    })
+
+    (mkIf (xcfg.enable && cfg.enable) {
 
       warnings = optional config.services.xserver.desktopManager.kde4.enable
         "KDE 4 should not be enabled at the same time as KDE 5";
@@ -120,7 +133,6 @@ in
           kde5.kdecoration
           kde5.kdeplasma-addons
           kde5.kgamma5
-        kde5.khelpcenter
           kde5.khotkeys
           kde5.kinfocenter
           kde5.kmenuedit
@@ -133,7 +145,6 @@ in
           kde5.libkscreen
           kde5.libksysguard
           kde5.milou
-        kde5.oxygen
           kde5.plasma-integration
           kde5.polkit-kde-agent
           kde5.systemsettings
@@ -142,12 +153,10 @@ in
           kde5.plasma-workspace
           kde5.plasma-workspace-wallpapers
 
-        kde5.dolphin
           kde5.dolphin-plugins
           kde5.ffmpegthumbs
           kde5.kdegraphics-thumbnailers
           kde5.kio-extras
-        kde5.konsole
           kde5.print-manager
 
           # Install Breeze icons if available
@@ -179,6 +188,15 @@ in
         ++ lib.optional config.services.colord.enable pkgs.colord-kde
         ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ];
 
+      services.xserver.desktopManager.kde5.extraPackages =
+        [
+          kde5.khelpcenter
+          kde5.oxygen
+
+          kde5.dolphin
+          kde5.konsole
+        ];
+
       environment.pathsToLink = [ "/share" ];
 
       environment.etc = singleton {
@@ -186,9 +204,9 @@ in
         target = "X11/xkb";
       };
 
-    # Enable GTK applications to load SVG icons
       environment.variables =
         {
+          # Enable GTK applications to load SVG icons
           GST_PLUGIN_SYSTEM_PATH_1_0 =
             lib.makeSearchPath "/lib/gstreamer-1.0"
             (builtins.map (pkg: pkg.out) (with pkgs.gst_all_1; [
@@ -229,6 +247,7 @@ in
 
       security.pam.services.kde = { allowNullPassword = true; };
 
-  };
+    })
+  ];
 
 }

pkgs/applications/editors/kile/frameworks.nix

@@ -60,8 +60,9 @@ let
       };
     };
 in
-kdeWrapper unwrapped
+kdeWrapper
 {
+  inherit unwrapped;
   targets = [ "bin/kile" ];
   paths = [ konsole.unwrapped ];
 }

pkgs/applications/misc/yakuake/3.0.nix

@@ -55,9 +55,9 @@ let
 
 
 in
-kdeWrapper unwrapped
+kdeWrapper
 {
+  inherit unwrapped;
   targets = [ "bin/yakuake" ];
   paths = [ konsole.unwrapped ];
 }
-

pkgs/applications/networking/irc/konversation/1.6.nix

@@ -75,7 +75,8 @@ let
       homepage = https://konversation.kde.org;
     };
   };
-in kdeWrapper unwrapped {
+in kdeWrapper {
+  inherit unwrapped;
   targets = [ "bin/konversation" ];
 }
 

pkgs/desktops/kde-5/applications/ark/default.nix

@@ -36,7 +36,8 @@ let
       };
     };
 in
-kdeWrapper unwrapped
+kdeWrapper
 {
+  inherit unwrapped;
   targets = [ "bin/ark" ];
 }

pkgs/desktops/kde-5/applications/dolphin.nix

@@ -24,8 +24,9 @@ let
       ];
     };
 in
-kdeWrapper unwrapped
+kdeWrapper
 {
+  inherit unwrapped;
   targets = [ "bin/dolphin" ];
   paths = [ dolphin-plugins konsole.unwrapped ];
 }

pkgs/desktops/kde-5/applications/filelight.nix

@@ -18,4 +18,7 @@ let
       ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/filelight" ]; }
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/filelight" ];
+}

pkgs/desktops/kde-5/applications/gwenview.nix

@@ -20,7 +20,8 @@ let
       ];
     };
 in
-kdeWrapper unwrapped {
+kdeWrapper {
+  inherit unwrapped;
   targets = [ "bin/gwenview" ];
   paths = [ kipi-plugins ];
 }

pkgs/desktops/kde-5/applications/kate.nix

@@ -24,8 +24,9 @@ let
       ];
     };
 in
-kdeWrapper unwrapped
+kdeWrapper
 {
+  inherit unwrapped;
   targets = [ "bin/kate" "bin/kwrite" ];
   paths = [ konsole.unwrapped ];
 }

pkgs/desktops/kde-5/applications/kcalc.nix

@@ -18,4 +18,7 @@ let
       ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/kcalc" ]; }
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/kcalc" ];
+}

pkgs/desktops/kde-5/applications/kcolorchooser.nix

@@ -15,4 +15,7 @@ let
       propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/kcolorchooser" ]; }
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/kcolorchooser" ];
+}

pkgs/desktops/kde-5/applications/kdenlive.nix

@@ -74,8 +74,9 @@ unwrapped = kdeApp {
   };
 };
 in
-kdeWrapper unwrapped
+kdeWrapper
 {
+  inherit unwrapped;
   targets = [ "bin/kdenlive" ];
   paths = [ kinit ];
 }

pkgs/desktops/kde-5/applications/kdf.nix

@@ -18,4 +18,7 @@ let
       ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/kdf" ]; }
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/kdf" ];
+}

pkgs/desktops/kde-5/applications/khelpcenter.nix

@@ -16,4 +16,7 @@ let
       ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/khelpcenter" ]; }
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/khelpcenter" ];
+}

pkgs/desktops/kde-5/applications/kompare.nix

@@ -15,4 +15,7 @@ let
       ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/kompare" ]; }
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/kompare" ];
+}

pkgs/desktops/kde-5/applications/konsole.nix

@@ -24,4 +24,7 @@ let
       ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/konsole" ]; }
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/konsole" ];
+}

pkgs/desktops/kde-5/applications/kwalletmanager.nix

@@ -30,6 +30,7 @@ let
       kxmlgui
     ];
   };
-in kdeWrapper unwrapped {
+in kdeWrapper {
+  inherit unwrapped;
   targets = ["bin/kwalletmanager5"];
 }

pkgs/desktops/kde-5/applications/marble.nix

@@ -18,7 +18,8 @@ let
       enableParallelBuilding = true;
     };
 in
-kdeWrapper unwrapped {
+kdeWrapper {
+  inherit unwrapped;
   targets = [ "bin/marble-qt" ];
   paths = [ unwrapped ];
 }

pkgs/desktops/kde-5/applications/okular.nix

@@ -25,6 +25,7 @@ let
     };
   };
 in
-kdeWrapper unwrapped {
+kdeWrapper {
+  inherit unwrapped;
   targets = [ "bin/okular" ];
 }

pkgs/desktops/kde-5/applications/spectacle.nix

@@ -18,7 +18,8 @@ let
       ];
     };
 in
-kdeWrapper unwrapped {
+kdeWrapper {
+  inherit unwrapped;
   targets = [ "bin/spectacle" ];
   paths = [ kipi-plugins ];
 }

pkgs/desktops/kde-5/plasma/oxygen.nix

@@ -15,6 +15,7 @@ let
     ];
   };
 in
-kdeWrapper unwrapped {
+kdeWrapper {
+  inherit unwrapped;
   targets = [ "bin/oxygen-demo5" "bin/oxygen-settings5" ];
 }

pkgs/development/libraries/kde-frameworks/kde-wrapper.nix

@@ -1,31 +1,47 @@
 { stdenv, lib, makeWrapper, buildEnv }:
 
-drv:
-
-{ targets, paths ? [] }:
+packages:
 
 let
+  packages_ = if builtins.isList packages then packages else [packages];
+
+  unwrapped = lib.concatMap (p: if builtins.isList p.unwrapped then p.unwrapped else [p.unwrapped]) packages_;
+  targets = lib.concatMap (p: p.targets) packages_;
+  paths = lib.concatMap (p: p.paths or []) packages_;
+
+  name =
+    if builtins.length unwrapped == 1
+    then (lib.head unwrapped).name
+    else "kde-application";
+  meta =
+    if builtins.length unwrapped == 1
+    then (lib.head unwrapped).meta
+    else {};
+
   env = buildEnv {
-    inherit (drv) name meta;
-    paths = builtins.map lib.getBin ([drv] ++ paths);
+    inherit name meta;
+    paths = builtins.map lib.getBin (unwrapped ++ paths);
     pathsToLink = [ "/bin" "/share" "/lib/qt5" "/etc/xdg" ];
   };
 in
 
 stdenv.mkDerivation {
-  inherit (drv) name meta;
+  inherit name meta;
   preferLocalBuild = true;
 
-  paths = builtins.map lib.getBin ([drv] ++ paths);
-  inherit drv env targets;
-  passthru = { unwrapped = drv; };
+  inherit unwrapped env targets;
+
+  passthru = {
+    inherit targets paths;
+    unwrapped = if builtins.length unwrapped == 1 then lib.head unwrapped else unwrapped;
+  };
 
   nativeBuildInputs = [ makeWrapper ];
 
-  builder = builtins.toFile "builder.sh" ''
-    . $stdenv/setup
-
+  buildCommand = ''
     for t in $targets; do
+        good=""
+        for drv in $unwrapped; do
             if [ -a "$drv/$t" ]; then
                 makeWrapper "$drv/$t" "$out/$t" \
                     --argv0 '"$0"' \
@@ -35,19 +51,23 @@ stdenv.mkDerivation {
                     --set QML_IMPORT_PATH "$env/lib/qt5/imports" \
                     --set QML2_IMPORT_PATH "$env/lib/qt5/qml" \
                     --set QT_PLUGIN_PATH "$env/lib/qt5/plugins"
-        else
-            echo "no such file or directory: $drv/$t"
+                good="1"
+                break
+            fi
+        done
+        if [ -z "$good" ]; then
+            echo "file or directory not found in derivations: $t"
             exit 1
         fi
     done
 
-    if [ -a "$drv/share" ]; then
-        ln -s "$drv/share" "$out"
-    fi
+    ln -s "$env/share" "$out"
 
+    for drv in $unwrapped; do
         if [ -a "$drv/nix-support/propagated-user-env-packages" ]; then
             mkdir -p "$out/nix-support"
-        ln -s "$drv/nix-support/propagated-user-env-packages" "$out/nix-support/"
+            cat "$drv/nix-support/propagated-user-env-packages" >> "$out/nix-support/propagated-user-env-packages"
         fi
+    done
   '';
 }

pkgs/tools/misc/kronometer/default.nix

@@ -23,6 +23,7 @@ let
     propagatedBuildInputs = [ kconfig kinit ];
   };
 in
-kdeWrapper unwrapped {
+kdeWrapper {
+  inherit unwrapped;
   targets = [ "bin/kronometer" ];
 }

pkgs/tools/misc/peruse/default.nix

@@ -37,6 +37,7 @@ let
 
   };
 
-in kdeWrapper unwrapped {
+in kdeWrapper {
+  inherit unwrapped;
   targets = [ "bin/peruse" ];
 }