opencv: drop the explicit configuration of --with-gcc and --with-ld
According to https://github.com/NixOS/nixpkgs/pull/50192#issuecomment-438206551,
this won't be necessary any more with modern versions of the package.
commit4da78502b73c4d6098584ddcb62d58192c8ca0c0
authorPeter Simons <simons@cryp.to>
dateTue 13 Nov 2018, 13:37 (8 years ago)
parent8927afe
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs−2
@@ -351,8 +351,6 @@ webkitgtk24xHook = set (libraryDepends . pkgconfig . contains (pkg "webkitgtk24x
351351opencvOverrides :: Derivation -> Derivation
352352opencvOverrides = set phaseOverrides "hardeningDisable = [ \"bindnow\" ];"
353353 . over (libraryDepends . pkgconfig) (replace (pkg "opencv") (pkg "opencv3"))
354− . set (configureFlags . contains "--with-gcc=${stdenv.cc}/bin/c++") True
355− . set (configureFlags . contains "--with-ld=${stdenv.cc}/bin/c++") True
356354
357355hspecCoreOverrides :: Derivation -> Derivation -- https://github.com/hspec/hspec/issues/330
358356hspecCoreOverrides = set phaseOverrides "testTarget = \"--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'\";"
test/golden-test-cases/opencv.nix.golden−3
@@ -9,9 +9,6 @@ mkDerivation {
99 pname = "opencv";
1010 version = "0.0.2.1";
1111 sha256 = "deadbeef";
12− configureFlags = [
13− "--with-gcc=${stdenv.cc}/bin/c++" "--with-ld=${stdenv.cc}/bin/c++"
14− ];
1512 setupHaskellDepends = [ base Cabal ];
1613 libraryHaskellDepends = [
1714 aeson base base64-bytestring bindings-DSL bytestring containers