From 1281a4eb1af224b368df2352717fcc5a4fc7e5b4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Oct 2014 13:35:04 +0100 Subject: [PATCH] haskell-wxc: patch out the attempt to run ldconfig to fix the build --- .../libraries/haskell/wxHaskell/no-ldconfig.patch | 10 ++++++++++ pkgs/development/libraries/haskell/wxHaskell/wxc.nix | 4 +--- 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch diff --git a/pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch b/pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch new file mode 100644 index 00000000000..72a8648cab6 --- /dev/null +++ b/pkgs/development/libraries/haskell/wxHaskell/no-ldconfig.patch @@ -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 +- diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix index dc295d04c4b..a54ee5873a7 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix @@ -9,9 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; noHaddock = true; - postInstall = '' - cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so - ''; + patches = [ ./no-ldconfig.patch ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell C++ wrapper";