pyrox.dev / nixpkgs
lol
fork atom

haskell-opencv: fix build and #47595

The applied patch can be removed, when
https://github.com/LumiGuide/haskell-opencv/commit/cd613e200aa20887ded83256cf67d6903c207a60
hits hackage and later nixpkgs.

Closes https://github.com/NixOS/nixpkgs/pull/50192.
Closes https://github.com/NixOS/nixpkgs/issues/47595.

authored by Eric Wolf and committed by Peter Simons 5966c569 032d610a

+15
unified split
+4
pkgs/development/haskell-modules/configuration-common.nix
··· 251 251 # Fails for non-obvious reasons while attempting to use doctest. 252 252 search = dontCheck super.search; 253 253 254 + # see https://github.com/LumiGuide/haskell-opencv/commit/cd613e200aa20887ded83256cf67d6903c207a60 255 + opencv = dontCheck (appendPatch super.opencv ./patches/opencv-fix-116.patch); 256 + opencv-extra = dontCheck (appendPatch super.opencv-extra ./patches/opencv-fix-116.patch); 257 + 254 258 # https://github.com/ekmett/structures/issues/3 255 259 structures = dontCheck super.structures; 256 260
+11
pkgs/development/haskell-modules/patches/opencv-fix-116.patch
··· 1 + diff -ur opencv-0.0.2.1.bak/Setup.hs opencv-0.0.2.1/Setup.hs 2 + --- opencv-0.0.2.1.bak/Setup.hs 2018-11-10 17:18:41.355731189 +0100 3 + +++ opencv-0.0.2.1/Setup.hs 2018-11-10 17:18:56.901681162 +0100 4 + @@ -3,6 +3,6 @@ 5 + 6 + main = do 7 + args <- getArgs 8 + - let args' | "configure" `elem` args = args ++ ["--with-gcc","c++", "--with-ld","c++"] 9 + + let args' | "configure" `elem` args = args ++ ["--with-gcc","c++"] 10 + | otherwise = args 11 + defaultMainArgs args'