mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-13 05:05:29 +03:00
affine: fix build (#368358)
This commit is contained in:
commit
7771f9dac3
1 changed files with 6 additions and 4 deletions
|
@ -2,7 +2,6 @@
|
||||||
cacert,
|
cacert,
|
||||||
cargo,
|
cargo,
|
||||||
copyDesktopItems,
|
copyDesktopItems,
|
||||||
electron_33,
|
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
findutils,
|
findutils,
|
||||||
|
@ -10,14 +9,15 @@
|
||||||
lib,
|
lib,
|
||||||
makeDesktopItem,
|
makeDesktopItem,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
nodejs_20,
|
|
||||||
rsync,
|
rsync,
|
||||||
rustPlatform,
|
rustPlatform,
|
||||||
rustc,
|
rustc,
|
||||||
stdenv,
|
stdenv,
|
||||||
stdenvNoCC,
|
stdenvNoCC,
|
||||||
yarn,
|
yarn-berry,
|
||||||
zip,
|
zip,
|
||||||
|
electron_33,
|
||||||
|
nodejs_20,
|
||||||
buildType ? "stable",
|
buildType ? "stable",
|
||||||
commandLineArgs ? "",
|
commandLineArgs ? "",
|
||||||
}:
|
}:
|
||||||
|
@ -32,6 +32,8 @@ let
|
||||||
.${hostPlatform.parsed.cpu.name}
|
.${hostPlatform.parsed.cpu.name}
|
||||||
or (throw "affine(${buildType}): unsupported CPU family ${hostPlatform.parsed.cpu.name}");
|
or (throw "affine(${buildType}): unsupported CPU family ${hostPlatform.parsed.cpu.name}");
|
||||||
electron = electron_33;
|
electron = electron_33;
|
||||||
|
nodejs = nodejs_20;
|
||||||
|
yarn = yarn-berry.override { inherit nodejs; };
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation (
|
stdenv.mkDerivation (
|
||||||
finalAttrs:
|
finalAttrs:
|
||||||
|
@ -121,7 +123,7 @@ stdenv.mkDerivation (
|
||||||
};
|
};
|
||||||
nativeBuildInputs =
|
nativeBuildInputs =
|
||||||
[
|
[
|
||||||
nodejs_20
|
nodejs
|
||||||
yarn
|
yarn
|
||||||
cargo
|
cargo
|
||||||
rustc
|
rustc
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue