mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
plasma5: allow overriding stdenv in wrapper
Will be needed for the next commits
This commit is contained in:
parent
d5210b6725
commit
0a1a4be75e
@ -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;
|
||||
});
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user