diff options
author | Michael Alan Dorman <mdorman@ironicdesign.com> | 2018-05-05 07:33:37 -0400 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2018-05-06 19:31:04 +0200 |
commit | 4764a6e2e9d375ec7ecba642fe5f2666ca0c6256 (patch) | |
tree | 6026423c6b7970af0701a1b7062e7620599f34d7 /pkgs/development | |
parent | fe95c5c64f9eb8a8766a6ea1ddcf69ca9436fb46 (diff) | |
download | nixlib-4764a6e2e9d375ec7ecba642fe5f2666ca0c6256.tar nixlib-4764a6e2e9d375ec7ecba642fe5f2666ca0c6256.tar.gz nixlib-4764a6e2e9d375ec7ecba642fe5f2666ca0c6256.tar.bz2 nixlib-4764a6e2e9d375ec7ecba642fe5f2666ca0c6256.tar.lz nixlib-4764a6e2e9d375ec7ecba642fe5f2666ca0c6256.tar.xz nixlib-4764a6e2e9d375ec7ecba642fe5f2666ca0c6256.tar.zst nixlib-4764a6e2e9d375ec7ecba642fe5f2666ca0c6256.zip |
haskell-gi, gi-gdkx11: fix builds
The `haskell-gi` build fails its doctests because of a missing library; I'm not 100% convinced that setting it to `dontCheck` is the right thing to do, but I don't have a better idea at the moment. The `gi-gdkx11` build fails because, surprise, Gdk-X11 isn't found; by looking around in my store, I found that that that library seems to live in gtk3 these days; this override is just a stop-gap, though, I've also submitted the change to cabal2nix that I believe will fix the automatic generation of the package in the future.
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8c7ef561f171..84c08aaffdd3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -422,6 +422,9 @@ self: super: { # https://github.com/evanrinehart/mikmod/issues/1 mikmod = addExtraLibrary super.mikmod pkgs.libmikmod; + haskell-gi = dontCheck super.haskell-gi; + gi-gdkx11 = super.gi-gdkx11.override { gdk-x11 = pkgs.gtk3; }; + # https://github.com/basvandijk/threads/issues/10 threads = dontCheck super.threads; |