Merge pull request kmonad#723 from rvl/master

Fix build with GHC 9.6
brttbndr · Jul 26, 2023 · 5bdd05a · 5bdd05a
2 parents 41a41c8 + 3851f2b
commit 5bdd05a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/KMonad/Keyboard/IO/Linux/DeviceSource.hs b/src/KMonad/Keyboard/IO/Linux/DeviceSource.hs
@@ -132,12 +132,12 @@ lsOpen :: (HasLogFunc e)
  -> FilePath -- ^ The path to the device file
  -> RIO e DeviceFile
 lsOpen pr pt = do
-#if MIN_VERSION_unix(2,8,0)
- h <- liftIO . openFd pt ReadOnly $
-#else
- h <- liftIO . openFd pt ReadOnly Nothing $
+ h <- liftIO $ openFd pt
+  ReadOnly
+#if !MIN_VERSION_unix(2,8,0)
+  Nothing
 #endif
- OpenFileFlags False False False False False
+ defaultFileFlags
  hd <- liftIO $ fdToHandle h
  logInfo "Initiating ioctl grab"
  ioctl_keyboard h True `onErr` IOCtlGrabError pt

diff --git a/src/KMonad/Keyboard/IO/Linux/UinputSink.hs b/src/KMonad/Keyboard/IO/Linux/UinputSink.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE CPP #-}
 {-|
 Module : KMonad.Keyboard.IO.Linux.UinputSink
 Description : Using Linux's uinput interface to emit events
@@ -141,8 +142,12 @@ send_event u (Fd h) e@(LinuxKeyEvent (s', ns', typ, c, val)) = do
 usOpen :: HasLogFunc e => UinputCfg -> RIO e UinputSink
 usOpen c = do
  when (null $ c ^. keyboardName) $ throwM EmptyNameError
- fd <- liftIO . openFd "/dev/uinput" WriteOnly Nothing $
- OpenFileFlags False False False True False
+ fd <- liftIO $ openFd "/dev/uinput"
+ WriteOnly
+#if !MIN_VERSION_unix(2,8,0)
+ Nothing
+#endif
+ defaultFileFlags
  logInfo "Registering Uinput device"
  acquire_uinput_keysink fd c `onErr` UinputRegistrationError (c ^. keyboardName)
  flip (maybe $ pure ()) (c^.postInit) $ \cmd -> do