From 5966c5698f8c8928ca86d840249d89a04bdbed1a Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Sat, 10 Nov 2018 17:07:54 +0100 Subject: [PATCH] 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. --- .../haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/patches/opencv-fix-116.patch | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/haskell-modules/patches/opencv-fix-116.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5928f6624e9..690551a4255 100644 --- 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 new file mode 100644 index 00000000000..bf89d8daf9f --- /dev/null +++ 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'