diff options
| author | Peter Simons <simons@cryp.to> | 2015-02-21 14:41:29 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-02-21 18:53:35 +0100 |
| commit | 862d224c69562f0ce0e0b0bd2e00ebcf8ed27ffd (patch) | |
| tree | cb0fb38ff3aa0adba8564d0d8a4f09e0fbf6c677 /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | 14fe14955131449d0031a64f9ba0264e7c5ada46 (diff) | |
| download | nixpkgs-862d224c69562f0ce0e0b0bd2e00ebcf8ed27ffd.tar nixpkgs-862d224c69562f0ce0e0b0bd2e00ebcf8ed27ffd.tar.gz nixpkgs-862d224c69562f0ce0e0b0bd2e00ebcf8ed27ffd.tar.bz2 nixpkgs-862d224c69562f0ce0e0b0bd2e00ebcf8ed27ffd.tar.lz nixpkgs-862d224c69562f0ce0e0b0bd2e00ebcf8ed27ffd.tar.xz nixpkgs-862d224c69562f0ce0e0b0bd2e00ebcf8ed27ffd.tar.zst nixpkgs-862d224c69562f0ce0e0b0bd2e00ebcf8ed27ffd.zip | |
haskell-wxc: fix build
Our 'wxGTK' attribute refers to wxwidgets 2.8 by default, but haskell-wxc needs version 2.9 or later. Resolves https://github.com/NixOS/nixpkgs/issues/6478.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ad88c0cd582..f57928a49fe 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -532,6 +532,14 @@ self: super: { # https://github.com/NixOS/nixpkgs/issues/6343 c2hs = dontCheck super.c2hs; + # wxc needs help deciding which version of GTK to use. + wxc = overrideCabal (super.wxc.override { wxGTK = pkgs.wxGTK29; }) (drv: { + patches = [ ./wxc-no-ldconfig.patch ]; + doHaddock = false; + postInstall = "cp -v dist/build/libwxc.so.${drv.version} $out/lib/libwxc.so"; + }); + wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK29; }; + } // { # Not on Hackage. |