From a7cb42e1c2f73bce0cb9bfad8fa728f52fe30c34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 17 Jul 2015 14:51:09 +0200 Subject: [PATCH] haskell-wx: clean up overrides --- .../haskell-modules/configuration-common.nix | 8 ++------ .../haskell-modules/patches/wxc-no-ldconfig.patch | 10 ---------- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/wxc-no-ldconfig.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5e412dab8d4..20dbe979f78 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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. diff --git a/pkgs/development/haskell-modules/patches/wxc-no-ldconfig.patch b/pkgs/development/haskell-modules/patches/wxc-no-ldconfig.patch deleted file mode 100644 index 72a8648cab6..00000000000 --- a/pkgs/development/haskell-modules/patches/wxc-no-ldconfig.patch +++ /dev/null @@ -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 --