feat: load colors from X resources

1 files changed, 5 insertions, 21 deletions

diff --git a/default.nix b/default.nix
index f670ad4..dc2a890 100644
--- a/default.nix
+++ b/default.nix
@@ -31,31 +31,15 @@ let
       }));
       X11 = (self.callCabal2nix "X11"
         (pkgs.fetchFromGitHub {
-          owner = "xmonad";
+          owner = "aforemny";
           repo = "X11";
-          rev = "1ead9698c89e78884ac771c93822447999a1dc46";
-          hash = "sha256-OAZ3gnUezsumBC8VwhcsKq+Nrq44L4xY/z6exK7InLo=";
+          rev = "70d7a6fba00d4ffe65db90cd3a2e0883ca690a88";
+          hash = "sha256-PsRtqaTyo+z8uPpsr7G3a0WF3Wh1NTWumu0rFlkLJMM=";
         })
         { }).overrideAttrs (oldAttrs: {
         preConfigure = oldAttrs.preConfigure or "" + ''
-          ${pkgs.autoconf}/bin/autoreconf'';
-        patches = oldAttrs.patches or [ ] ++ [
-          (pkgs.writers.writeText "X11-safe-select.patch" ''
-            diff --git a/Graphics/X11/Xlib/Event.hsc b/Graphics/X11/Xlib/Event.hsc
-            index 842fc2f..869aba8 100644
-            --- a/Graphics/X11/Xlib/Event.hsc
-            +++ b/Graphics/X11/Xlib/Event.hsc
-            @@ -419,7 +419,7 @@ newtype FdSet = FdSet (Ptr FdSet)
-             foreign import ccall unsafe "HsXlib.h" fdZero :: Ptr FdSet -> IO ()
-             foreign import ccall unsafe "HsXlib.h" fdSet :: CInt -> Ptr FdSet -> IO ()
-
-            -foreign import ccall unsafe "HsXlib.h" select ::
-            +foreign import ccall safe "HsXlib.h" select ::
-                     CInt -> Ptr FdSet -> Ptr FdSet -> Ptr FdSet -> Ptr TimeVal -> IO CInt
-
-             -- | This function is somewhat compatible with Win32's @TimeGetTime()@
-          '')
-        ];
+          ${pkgs.autoconf}/bin/autoreconf
+        '';
       });
     };
   };