summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2016-07-05 00:51:33 +0200
committerJoachim Fasting <joachifm@fastmail.fm>2016-07-05 00:54:12 +0200
commit3f5d7c7e04aba62c14e78133465814925ba4883f (patch)
treed73478b59489fe7b38e309464bab4f817612b2bf /pkgs/top-level
parent966c75ef0cfe712b83283b6ea6930c166b6a109b (diff)
downloadnixlib-3f5d7c7e04aba62c14e78133465814925ba4883f.tar
nixlib-3f5d7c7e04aba62c14e78133465814925ba4883f.tar.gz
nixlib-3f5d7c7e04aba62c14e78133465814925ba4883f.tar.bz2
nixlib-3f5d7c7e04aba62c14e78133465814925ba4883f.tar.lz
nixlib-3f5d7c7e04aba62c14e78133465814925ba4883f.tar.xz
nixlib-3f5d7c7e04aba62c14e78133465814925ba4883f.tar.zst
nixlib-3f5d7c7e04aba62c14e78133465814925ba4883f.zip
geis: refactor & fix build
- Pass -Wno-error=pedantic to work around ISO C violations
- Build with X11 unconditionally (also rely on pkgconfig for
  detection, --enable-x11 does not work)
- Build against evemu
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d33a3e09e3a..a39ae1a75021 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6290,7 +6290,9 @@ in
 
   m4 = gnum4;
 
-  geis = callPackage ../development/libraries/geis { };
+  geis = callPackage ../development/libraries/geis {
+    inherit (xorg) libX11 libXext libXi libXtst;
+  };
 
   global = callPackage ../development/tools/misc/global { };