Fix build on OS X

Author: basvandijk

opencv-extra/Setup.hs

@@ -3,6 +3,6 @@ import System.Environment ( getArgs )
 
 main = do
     args <- getArgs
-    let args' | "configure" `elem` args = args ++ ["--with-gcc","g++", "--with-ld","g++"]
+    let args' | "configure" `elem` args = args ++ ["--with-gcc","c++", "--with-ld","c++"]
               | otherwise               = args
     defaultMainArgs args'

opencv-extra/opencv-extra.nix

@@ -73,8 +73,8 @@ mkDerivation {
   libraryPkgconfigDepends = [ opencv3 ];
 
   configureFlags =
-    [ "--with-gcc=g++"
-      "--with-ld=g++"
+    [ "--with-gcc=${stdenv.cc}/bin/c++"
+      "--with-ld=${stdenv.cc}/bin/c++"
     ];
 
   hardeningDisable = [ "bindnow" ];

opencv/Setup.hs

@@ -3,6 +3,6 @@ import System.Environment ( getArgs )
 
 main = do
     args <- getArgs
-    let args' | "configure" `elem` args = args ++ ["--with-gcc","g++", "--with-ld","g++"]
+    let args' | "configure" `elem` args = args ++ ["--with-gcc","c++", "--with-ld","c++"]
               | otherwise               = args
     defaultMainArgs args'

opencv/opencv.nix

@@ -103,8 +103,8 @@ mkDerivation ({
   libraryPkgconfigDepends = [ opencv3 ];
 
   configureFlags =
-    [ "--with-gcc=g++"
-      "--with-ld=g++"
+    [ "--with-gcc=${stdenv.cc}/bin/c++"
+      "--with-ld=${stdenv.cc}/bin/c++"
     ];
 
   hardeningDisable = [ "bindnow" ];