JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yarn2nix: Add support for nativeBuildInputs in pkgConfig

Browse Source
This commit is contained in:
Jan Tojnar 2022-01-28 17:33:06 +01:00
parent c07b471b52
commit ecb6f035e6
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
View File

@ -76,9 +76,14 @@ in rec {
workspaceDependencies ? [], # List of yarn packages
}:
let
extraBuildInputs = (lib.flatten (builtins.map (key:
pkgConfig.${key}.buildInputs or []
) (builtins.attrNames pkgConfig)));
extraNativeBuildInputs =
lib.concatMap
(key: pkgConfig.${key}.nativeBuildInputs or [])
(builtins.attrNames pkgConfig);
extraBuildInputs =
lib.concatMap
(key: pkgConfig.${key}.buildInputs or [])
(builtins.attrNames pkgConfig);
postInstall = (builtins.map (key:
if (pkgConfig.${key} ? postInstall) then
@ -106,7 +111,8 @@ in rec {
inherit preBuild postBuild name;
dontUnpack = true;
dontInstall = true;
buildInputs = [ yarn nodejs git ] ++ extraBuildInputs;
nativeBuildInputs = [ yarn nodejs git ] ++ extraNativeBuildInputs;
buildInputs = extraBuildInputs;
configurePhase = lib.optionalString (offlineCache ? outputHash) ''
if ! cmp -s ${yarnLock} ${offlineCache}/yarn.lock; then