diff options
author | Eric Wolf <ericwolf42@gmail.com> | 2018-11-10 17:07:54 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2018-11-13 14:00:06 +0000 |
commit | 5966c5698f8c8928ca86d840249d89a04bdbed1a (patch) | |
tree | b820bea7f7876ed324e33958f5f163e143c35d68 /pkgs/development/haskell-modules/patches | |
parent | 032d610aedca15e8790ed20d3fd01a9dee6d4b8e (diff) | |
download | nixpkgs-5966c5698f8c8928ca86d840249d89a04bdbed1a.tar nixpkgs-5966c5698f8c8928ca86d840249d89a04bdbed1a.tar.gz nixpkgs-5966c5698f8c8928ca86d840249d89a04bdbed1a.tar.bz2 nixpkgs-5966c5698f8c8928ca86d840249d89a04bdbed1a.tar.lz nixpkgs-5966c5698f8c8928ca86d840249d89a04bdbed1a.tar.xz nixpkgs-5966c5698f8c8928ca86d840249d89a04bdbed1a.tar.zst nixpkgs-5966c5698f8c8928ca86d840249d89a04bdbed1a.zip |
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.
Diffstat (limited to 'pkgs/development/haskell-modules/patches')
-rw-r--r-- | pkgs/development/haskell-modules/patches/opencv-fix-116.patch | 11 |
1 files changed, 11 insertions, 0 deletions
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' |