haskell-opencv: fix build and #47595

The applied patch can be removed, when LumiGuide/haskell-opencv@cd613e2 hits hackage and later nixpkgs. Closes #50192. Closes #47595.
NixOS · Nov 13, 2018 · 5966c56 · 5966c56
1 parent 032d610
commit 5966c56
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
@@ -251,6 +251,10 @@ self: super: {
   # Fails for non-obvious reasons while attempting to use doctest.
   search = dontCheck super.search;
 
+  # see https://github.com/LumiGuide/haskell-opencv/commit/cd613e200aa20887ded83256cf67d6903c207a60
+  opencv = dontCheck (appendPatch super.opencv ./patches/opencv-fix-116.patch);
+  opencv-extra = dontCheck (appendPatch super.opencv-extra ./patches/opencv-fix-116.patch);
+
   # https://github.com/ekmett/structures/issues/3
   structures = dontCheck super.structures;
 

diff --git a/pkgs/development/haskell-modules/patches/opencv-fix-116.patch b/pkgs/development/haskell-modules/patches/opencv-fix-116.patch
@@ -0,0 +1,11 @@
+diff -ur opencv-0.0.2.1.bak/Setup.hs opencv-0.0.2.1/Setup.hs
+--- opencv-0.0.2.1.bak/Setup.hs	2018-11-10 17:18:41.355731189 +0100
++++ opencv-0.0.2.1/Setup.hs	2018-11-10 17:18:56.901681162 +0100
+@@ -3,6 +3,6 @@
+
+ main = do
+     args <- getArgs
+-    let args' | "configure" `elem` args = args ++ ["--with-gcc","c++", "--with-ld","c++"]
++    let args' | "configure" `elem` args = args ++ ["--with-gcc","c++"]
+               | otherwise               = args
+     defaultMainArgs args'