about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/with-packages-wrapper.nix
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2021-11-23 23:15:34 +0100
committersterni <sternenseemann@systemli.org>2021-11-24 10:21:39 +0100
commitc32095b400076b89d63920805dc95533607e78d2 (patch)
tree000459e86e13ccea421d73b77ebf7c6b360a5eb1 /pkgs/development/haskell-modules/with-packages-wrapper.nix
parent9be4a33018ad95ac946b4ac360d35b0b872d2905 (diff)
ghcWithPackages: rename withLLVM to useLLVM
useLLVM is what we are using in the GHC derivations already -- for
better or for worse -- so we should rename the argument here for
consistency which we are free to do as this is purely internal at the
moment (with overriding being impossible).
Diffstat (limited to 'pkgs/development/haskell-modules/with-packages-wrapper.nix')
-rw-r--r--pkgs/development/haskell-modules/with-packages-wrapper.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index e20456b860756..f7bebbc4aa07e 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, ghc, llvmPackages, packages, symlinkJoin, makeWrapper
 # Include LLVM by default if GHC doesn't have native code generation support
 # See https://gitlab.haskell.org/ghc/ghc/-/wikis/platforms
-, withLLVM ? !(lib.any lib.id ([
+, useLLVM ? !(lib.any lib.id ([
     stdenv.targetPlatform.isx86
     stdenv.targetPlatform.isPowerPC
     stdenv.targetPlatform.isSparc
@@ -59,7 +59,7 @@ let
                   ([ llvmPackages.llvm ]
                    ++ lib.optional stdenv.targetPlatform.isDarwin llvmPackages.clang);
 in
-if paths == [] && !withLLVM then ghc else
+if paths == [] && !useLLVM then ghc else
 symlinkJoin {
   # this makes computing paths from the name attribute impossible;
   # if such a feature is needed, the real compiler name should be saved
@@ -82,7 +82,7 @@ symlinkJoin {
           ${lib.optionalString (ghc.isGhcjs or false)
             ''--set NODE_PATH "${ghc.socket-io}/lib/node_modules"''
           } \
-          ${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''}
+          ${lib.optionalString useLLVM ''--prefix "PATH" ":" "${llvm}"''}
       fi
     done