!fixup settingsFile variable

TODO: annotate
NixOS · Sep 4, 2024 · ca53372 · ca53372
1 parent ce4208a
commit ca53372
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix
@@ -455,8 +455,10 @@ stdenv.mkDerivation (rec {
   requiredSystemFeatures = [ "big-parallel" ];
 
   postInstall = ''
+    settingsFile="$out/lib/${targetPrefix}${passthru.haskellCompilerName}/settings"
+
     # Make the installed GHC use the host platform's tools.
-    sed -i $out/lib/${targetPrefix}${passthru.haskellCompilerName}/settings \
+    sed -i "$settingsFile" \
       -e "s!$CC!${installCC}/bin/${installCC.targetPrefix}cc!g" \
       -e "s!$CXX!${installCC}/bin/${installCC.targetPrefix}c++!g" \
       -e "s!$LD!${installCC.bintools}/bin/${installCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}!g" \

diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -612,8 +612,10 @@ stdenv.mkDerivation ({
     # leave bindist directory
     popd
 
+    settingsFile="$out/lib/${targetPrefix}${haskellCompilerName}/lib/settings"
+
     # Make the installed GHC use the host platform's tools.
-    sed -i $out/lib/${targetPrefix}${haskellCompilerName}/lib/settings \
+    sed -i "$settingsFile" \
       -e "s!$CC!${installCC}/bin/${installCC.targetPrefix}cc!g" \
       -e "s!$CXX!${installCC}/bin/${installCC.targetPrefix}c++!g" \
       -e "s!$LD!${installCC.bintools}/bin/${installCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}!g" \

diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
@@ -473,8 +473,10 @@ stdenv.mkDerivation (rec {
   requiredSystemFeatures = [ "big-parallel" ];
 
   postInstall = ''
+    settingsFile="$out/lib/${targetPrefix}${passthru.haskellCompilerName}/settings"
+
     # Make the installed GHC use the host platform's tools.
-    ghc-settings-edit "$out/lib/${targetPrefix}${passthru.haskellCompilerName}/settings" \
+    ghc-settings-edit "$settingsFile" \
       "C compiler command" "${toolPath "cc" installCC}" \
       "Haskell CPP command" "${toolPath "cc" installCC}" \
       "C++ compiler command" "${toolPath "c++" installCC}" \