diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-02-01 01:38:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-01 01:38:06 +0100 |
| commit | 92f2b3e8114e962c7bcdf0071eba877340bbd57c (patch) | |
| tree | 08c5da8ff59b3cae3ac74b1a15099a9444cec45a /pkgs/development | |
| parent | 862c468fab39004fc4cc3d02399a9bceb0d3c0dd (diff) | |
| parent | ac9010920b7e1d2a72c6856f01f857c9ece9b94a (diff) | |
| download | nixpkgs-92f2b3e8114e962c7bcdf0071eba877340bbd57c.tar nixpkgs-92f2b3e8114e962c7bcdf0071eba877340bbd57c.tar.gz nixpkgs-92f2b3e8114e962c7bcdf0071eba877340bbd57c.tar.bz2 nixpkgs-92f2b3e8114e962c7bcdf0071eba877340bbd57c.tar.lz nixpkgs-92f2b3e8114e962c7bcdf0071eba877340bbd57c.tar.xz nixpkgs-92f2b3e8114e962c7bcdf0071eba877340bbd57c.tar.zst nixpkgs-92f2b3e8114e962c7bcdf0071eba877340bbd57c.zip | |
Merge pull request #155841 from r-ryantm/auto-update/Sharedown
sharedown: 3.0.1 -> 3.1.0
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index b0bf715e66e..087658fe551 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -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 |