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

haskell-opencv: fix build and #47595

Browse Source 
The applied patch can be removed, when
cd613e200a
hits hackage and later nixpkgs.

Closes https://github.com/NixOS/nixpkgs/pull/50192.
Closes https://github.com/NixOS/nixpkgs/issues/47595.
This commit is contained in:
Eric Wolf 2018-11-10 17:07:54 +01:00 committed by Peter Simons
parent 032d610aed
commit 5966c5698f
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

11
pkgs/development/haskell-modules/patches/opencv-fix-116.patch Normal file
View File

@ -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'