public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-wxc: fix build

Browse Source 
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.
This commit is contained in:
Peter Simons 2015-02-21 14:41:29 +01:00
parent 14fe149551
commit 862d224c69
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -532,6 +532,14 @@ self: super: {
# https://github.com/NixOS/nixpkgs/issues/6343 # https://github.com/NixOS/nixpkgs/issues/6343
c2hs = dontCheck super.c2hs; 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. # Not on Hackage.

3
pkgs/development/haskell-modules/hackage-packages.nix
View File

@ -122369,7 +122369,6 @@ self: {
homepage = "http://haskell.org/haskellwiki/WxHaskell"; homepage = "http://haskell.org/haskellwiki/WxHaskell";
description = "wxHaskell"; description = "wxHaskell";
license = "unknown"; license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none;
}) {}; }) {};
"wxAsteroids" = callPackage "wxAsteroids" = callPackage
@ -122417,7 +122416,6 @@ self: {
homepage = "http://haskell.org/haskellwiki/WxHaskell"; homepage = "http://haskell.org/haskellwiki/WxHaskell";
description = "wxHaskell C++ wrapper"; description = "wxHaskell C++ wrapper";
license = "unknown"; license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none;
}) { inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; }) { inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;
inherit (pkgs) wxGTK;}; inherit (pkgs) wxGTK;};
@ -122437,7 +122435,6 @@ self: {
homepage = "http://haskell.org/haskellwiki/WxHaskell"; homepage = "http://haskell.org/haskellwiki/WxHaskell";
description = "wxHaskell core"; description = "wxHaskell core";
license = "unknown"; license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none;
}) { inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; }) { inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;
inherit (pkgs) wxGTK;}; inherit (pkgs) wxGTK;};

10
pkgs/development/haskell-modules/wxc-no-ldconfig.patch Normal file
View File

@ -0,0 +1,10 @@
Only in wxc-0.91.0.0: dist
diff -ubr wxc-0.91.0.0-orig/Setup.hs wxc-0.91.0.0/Setup.hs
--- wxc-0.91.0.0-orig/Setup.hs 2014-10-31 13:30:15.514809137 +0100
+++ wxc-0.91.0.0/Setup.hs 2014-10-31 13:33:53.606372005 +0100
@@ -507,5 +507,3 @@
inst_lib_dir = libdir $ absoluteInstallDirs pkg_descr local_bld_info NoCopyDest
installOrdinaryFile (verbosity flags) (bld_dir </> lib_name) (inst_lib_dir </> lib_name)
- ldconfig inst_lib_dir
-