From 99476c1ec39eaa0933c14fe82ec1f63e31f4c9f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 6 Oct 2023 17:02:25 +0200 Subject: [PATCH] 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.) --- pkgs/applications/editors/quartus-prime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index c55603b3c214..d68925e752f4 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildFHSEnv, callPackage, makeDesktopItem, writeScript +{ lib, buildFHSEnv, callPackage, makeDesktopItem, writeScript, runtimeShell , runCommand, quartus-prime-lite , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] , unwrapped ? callPackage ./quartus.nix { inherit supportedDevices; } @@ -77,7 +77,7 @@ in buildFHSEnv rec { wrapped="$out/$relname" progs_wrapped+=("$wrapped") mkdir -p "$(dirname "$wrapped")" - echo "#!${stdenv.shell}" >> "$wrapped" + echo "#!${runtimeShell}" >> "$wrapped" case "$relname" in modelsim_ase/*) echo "export NIXPKGS_IS_MODELSIM_WRAPPER=1" >> "$wrapped"