quartus-prime-lite: use runtimeShell in wrappers
stdenv.shell is a shell for building, runtimeShell is for running, so the latter should be used in wrappers. (The distinction only matters when cross-compiling.)
This commit is contained in:
parent
215bb70952
commit
99476c1ec3
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, lib, buildFHSEnv, callPackage, makeDesktopItem, writeScript
|
{ lib, buildFHSEnv, callPackage, makeDesktopItem, writeScript, runtimeShell
|
||||||
, runCommand, quartus-prime-lite
|
, runCommand, quartus-prime-lite
|
||||||
, supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ]
|
, supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ]
|
||||||
, unwrapped ? callPackage ./quartus.nix { inherit supportedDevices; }
|
, unwrapped ? callPackage ./quartus.nix { inherit supportedDevices; }
|
||||||
@ -77,7 +77,7 @@ in buildFHSEnv rec {
|
|||||||
wrapped="$out/$relname"
|
wrapped="$out/$relname"
|
||||||
progs_wrapped+=("$wrapped")
|
progs_wrapped+=("$wrapped")
|
||||||
mkdir -p "$(dirname "$wrapped")"
|
mkdir -p "$(dirname "$wrapped")"
|
||||||
echo "#!${stdenv.shell}" >> "$wrapped"
|
echo "#!${runtimeShell}" >> "$wrapped"
|
||||||
case "$relname" in
|
case "$relname" in
|
||||||
modelsim_ase/*)
|
modelsim_ase/*)
|
||||||
echo "export NIXPKGS_IS_MODELSIM_WRAPPER=1" >> "$wrapped"
|
echo "export NIXPKGS_IS_MODELSIM_WRAPPER=1" >> "$wrapped"
|
||||||
|
Loading…
Reference in New Issue
Block a user