about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/patches
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2022-09-14 12:13:21 +0200
committersternenseemann <sternenseemann@systemli.org>2022-09-14 16:14:31 +0200
commit75f79c209a689c6f0e95f07cc241ab23efc36c8b (patch)
treef78d6633bb70b62c82783906ff8ae3a6addd956a /pkgs/development/haskell-modules/patches
parentec97ea81fae7801a2165f878236963f15d3dd19c (diff)
haskellPackages.xmonad: drop upstreamed Nix compat patch
We had a long standing downstream patch for XMonad allowing us to
override the ghc and xmessage binaries used. That has been upstreamed
and released in 0.17.1 and we can drop it!

* patch upstreamed in https://github.com/xmonad/xmonad/pull/409
* downstream patch adjusted in https://github.com/NixOS/nixpkgs/pull/184784
Diffstat (limited to 'pkgs/development/haskell-modules/patches')
-rw-r--r--pkgs/development/haskell-modules/patches/xmonad_0_17_0-nix.patch34
1 files changed, 0 insertions, 34 deletions
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
deleted file mode 100644
index 4288b70217151..0000000000000
--- a/pkgs/development/haskell-modules/patches/xmonad_0_17_0-nix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs
-index 46a0939..92af53d 100644
---- a/src/XMonad/Core.hs
-+++ b/src/XMonad/Core.hs
-@@ -46,6 +46,7 @@ import Data.Traversable (for)
- import Data.Time.Clock (UTCTime)
- import Data.Default.Class
- import Data.List (isInfixOf)
-+import System.Environment (lookupEnv)
- import System.FilePath
- import System.IO
- import System.Info
-@@ -458,7 +459,8 @@ xfork x = io . forkProcess . finally nullStdin $ do
- -- | Use @xmessage@ to show information to the user.
- xmessage :: MonadIO m => String -> m ()
- xmessage msg = void . xfork $ do
--    executeFile "xmessage" True
-+    xmessageBin <- fromMaybe "xmessage" <$> liftIO (lookupEnv "XMONAD_XMESSAGE")
-+    executeFile xmessageBin True
-         [ "-default", "okay"
-         , "-xrm", "*international:true"
-         , "-xrm", "*fontSet:-*-fixed-medium-r-normal-*-18-*-*-*-*-*-*-*,-*-fixed-*-*-*-*-18-*-*-*-*-*-*-*,-*-*-*-*-*-*-18-*-*-*-*-*-*-*"
-@@ -654,8 +656,9 @@ compile dirs method =
-         bracket (openFile (errFileName dirs) WriteMode) hClose $ \err -> do
-             let run = runProc (cfgDir dirs) err
-             case method of
--                CompileGhc ->
--                    run "ghc" ghcArgs
-+                CompileGhc -> do
-+                    ghc <- fromMaybe "ghc" <$> (lookupEnv "XMONAD_GHC")
-+                    run ghc ghcArgs
-                 CompileStackGhc stackYaml ->
-                     run "stack" ["build", "--silent", "--stack-yaml", stackYaml] .&&.
-                     run "stack" ("ghc" : "--stack-yaml" : stackYaml : "--" : ghcArgs)