branch master updated: gnu: xmonad: Add patch to support dynamic linking.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

samplet pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 5798302  gnu: xmonad: Add patch to support dynamic linking.
5798302 is described below

commit 57983029a9ad86dfad3ae5e352c24557ffae9829
Author: Timothy Sample <samplet@ngyro.com>
AuthorDate: Wed Sep 2 18:05:36 2020 -0400

    gnu: xmonad: Add patch to support dynamic linking.
    
    Fixes <https://bugs.gnu.org/43131>.
    
    * gnu/packages/patches/xmonad-dynamic-linking.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/wm.scm (xmonad)[source]: Use it.
---
 gnu/local.mk                                      |  1 +
 gnu/packages/patches/xmonad-dynamic-linking.patch | 16 ++++++++++++++++
 gnu/packages/wm.scm                               |  3 ++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 6e47d74..d2753f5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1676,6 +1676,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/xf86-video-voodoo-pcitag.patch          \
   %D%/packages/patches/xfce4-panel-plugins.patch               \
   %D%/packages/patches/xfce4-settings-defaults.patch           \
+  %D%/packages/patches/xmonad-dynamic-linking.patch            \
   %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch           \
   %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch        
\
   %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch      \
diff --git a/gnu/packages/patches/xmonad-dynamic-linking.patch 
b/gnu/packages/patches/xmonad-dynamic-linking.patch
new file mode 100644
index 0000000..4f3386e
--- /dev/null
+++ b/gnu/packages/patches/xmonad-dynamic-linking.patch
@@ -0,0 +1,16 @@
+This patch is required for xmonad to make use of shared libraries.
+Without it, xmonad will not work since we do not (by default) use
+statically linked Haskell libraries.
+
+diff -ruN xmonad-0.15-a/src/XMonad/Core.hs xmonad-0.15-b/src/XMonad/Core.hs
+--- xmonad-0.15-a/src/XMonad/Core.hs   1969-12-31 19:00:00.000000000 -0500
++++ xmonad-0.15-b/src/XMonad/Core.hs   1969-12-31 19:00:00.000000000 -0500
+@@ -681,6 +681,8 @@
+        compileGHC bin dir errHandle =
+          runProcess "ghc" ["--make"
+                           , "xmonad.hs"
++                          , "-dynamic"
++                          , "-fPIC"
+                           , "-i"
+                           , "-ilib"
+                           , "-fforce-recomp"
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index bb5a91a..15fbf43 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -655,7 +655,8 @@ desktop environment.")
                                   "xmonad-" version ".tar.gz"))
               (sha256
                (base32
-                "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa"))))
+                "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa"))
+              (patches (search-patches "xmonad-dynamic-linking.patch"))))
     (build-system haskell-build-system)
     (inputs
      `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions)