diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/window-managers/xmonad/wrapper.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/patches/xmonad_0_17_0-nix.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix index 409bf73c893f..9167b95ddff8 100644 --- a/pkgs/applications/window-managers/xmonad/wrapper.nix +++ b/pkgs/applications/window-managers/xmonad/wrapper.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation { buildCommand = '' install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz makeWrapper ${xmonadEnv}/bin/xmonad $out/bin/xmonad \ - --set NIX_GHC "${xmonadEnv}/bin/ghc" \ + --set XMONAD_GHC "${xmonadEnv}/bin/ghc" \ --set XMONAD_XMESSAGE "${xmessage}/bin/xmessage" ''; diff --git a/pkgs/development/haskell-modules/patches/xmonad_0_17_0-nix.patch b/pkgs/development/haskell-modules/patches/xmonad_0_17_0-nix.patch index e313aed69063..4288b7021715 100644 --- a/pkgs/development/haskell-modules/patches/xmonad_0_17_0-nix.patch +++ b/pkgs/development/haskell-modules/patches/xmonad_0_17_0-nix.patch @@ -27,7 +27,7 @@ index 46a0939..92af53d 100644 - CompileGhc -> - run "ghc" ghcArgs + CompileGhc -> do -+ ghc <- fromMaybe "ghc" <$> (lookupEnv "NIX_GHC") ++ ghc <- fromMaybe "ghc" <$> (lookupEnv "XMONAD_GHC") + run ghc ghcArgs CompileStackGhc stackYaml -> run "stack" ["build", "--silent", "--stack-yaml", stackYaml] .&&. |