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

haskell-wx: clean up overrides

Browse Source
This commit is contained in:
Peter Simons 2015-07-17 14:51:09 +02:00
parent 7bcc1bfc11
commit a7cb42e1c2
2 changed files with 2 additions and 16 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

@ -631,12 +631,8 @@ self: super: {
# https://github.com/vincenthz/hs-asn1/issues/12
asn1-encoding = dontCheck super.asn1-encoding;
# wxc needs help deciding which version of GTK to use.
wxc = overrideCabal (super.wxc.override { wxGTK = pkgs.wxGTK29; }) (drv: {
patches = [ ./patches/wxc-no-ldconfig.patch ];
doHaddock = false;
postInstall = "cp -v dist/build/libwxc.so.${drv.version} $out/lib/libwxc.so";
});
# wxc supports wxGTX >= 2.9, but our current default version points to 2.8.
wxc = super.wxc.override { wxGTK = pkgs.wxGTK29; };
wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK29; };
# Depends on QuickCheck 1.x.

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

@ -1,10 +0,0 @@
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
-