Skip to content

nixos/xmonad: rename NIX_GHC env var to XMONAD_GHC #184784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sternenseemann merged 2 commits into from
Aug 4, 2022
Merged

nixos/xmonad: rename NIX_GHC env var to XMONAD_GHC #184784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f47959c
nixos/xmonad: rename NIX_GHC env var to XMONAD_GHC
sternenseemann Aug 2, 2022
ff8c9f5
nixos/xmonad: don't reference nonexistent package sets in docs
sternenseemann Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nixos/modules/services/x11/window-managers/xmonad.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ let
install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz
makeWrapper ${configured}/bin/xmonad $out/bin/xmonad \
'' + optionalString cfg.enableConfiguredRecompile ''
--set NIX_GHC "${xmonadEnv}/bin/ghc" \
--set XMONAD_GHC "${xmonadEnv}/bin/ghc" \
'' + ''
--set XMONAD_XMESSAGE "${pkgs.xorg.xmessage}/bin/xmessage"
'');
Expand All @@ -46,7 +46,7 @@ in {
haskellPackages = mkOption {
default = pkgs.haskellPackages;
defaultText = literalExpression "pkgs.haskellPackages";
example = literalExpression "pkgs.haskell.packages.ghc784";
example = literalExpression "pkgs.haskell.packages.ghc8107";
type = types.attrs;
description = ''
haskellPackages used to build Xmonad and other packages.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/window-managers/xmonad/wrapper.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
'';

Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/patches/xmonad_0_17_0-nix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] .&&.
Expand Down