gnu: xmonad: Add patch to support dynamic linking.
authorTimothy Sample <samplet@ngyro.com>
Wed, 2 Sep 2020 22:05:36 +0000 (18:05 -0400)
committerTimothy Sample <samplet@ngyro.com>
Wed, 2 Sep 2020 22:09:01 +0000 (18:09 -0400)
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
gnu/packages/patches/xmonad-dynamic-linking.patch [new file with mode: 0644]
gnu/packages/wm.scm

index 6e47d74..d2753f5 100644 (file)
@@ -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 (file)
index 0000000..4f3386e
--- /dev/null
@@ -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"
index bb5a91a..15fbf43 100644 (file)
@@ -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)