From 0a1a4be75e81601b7941301673958e55c77125b2 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 14 Feb 2023 11:05:44 +0300 Subject: [PATCH] plasma5: allow overriding stdenv in wrapper Will be needed for the next commits --- pkgs/desktops/plasma-5/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index a0be6b9ee8c1..f8fc60a5409d 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -51,9 +51,9 @@ let mirror = "mirror://kde"; }; - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) { }; + qtStdenv = libsForQt5.callPackage ({ stdenv }: stdenv) {}; - packages = self: with self; + packages = self: let propagate = out: @@ -98,6 +98,7 @@ let defaultSetupHook = if hasBin && hasDev then propagateBin else null; setupHook = args.setupHook or defaultSetupHook; + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ libsForQt5.wrapQtAppsHook ]; meta = let meta = args.meta or { }; in @@ -109,8 +110,8 @@ let broken = meta.broken or broken; }; in - mkDerivation (args // { - inherit pname version meta outputs setupHook src; + (args.stdenv or qtStdenv).mkDerivation (args // { + inherit pname version meta outputs setupHook src nativeBuildInputs; }); };