Use the new Cabal-2.2 field cxx-options

Author: basvandijk

fetchNixpkgs.nix

@@ -1,4 +1,4 @@
 {
-  rev    = "69a03de0384d767a155a459c5385e2b316578bc0";
-  sha256 = "15p1z8k338d9rvis9wzk8mdjvk6925g9ks0zhwa18905k19zvr1v";
+  rev    = "1d9330d63a5a30f4eb578eda7840be7b11ec6277"; # nixos-unstable
+  sha256 = "1zrvi9nal5hzqq87slcm8p6dsjqczrrzaqyxda8rcpa5lb0kl1ky";
 }

nixpkgs-version.nix

@@ -4,11 +4,12 @@
 # See: https://nixos.wiki/wiki/How_to_fetch_Nixpkgs_with_an_empty_NIX_PATH
 
 let
-  fetchNixpkgs = import ./fetchNixpkgs.nix;
-
   nixpkgsVersion = import ./nixpkgs-version.nix;
 
-  nixpkgs = fetchNixpkgs nixpkgsVersion;
+  nixpkgs = builtins.fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs/archive/${nixpkgsVersion.rev}.tar.gz";
+    inherit (nixpkgsVersion) sha256;
+  };
 
   pkgs = import nixpkgs {};
 

nixpkgs.nix

@@ -1,13 +1,13 @@
+cabal-version: 2.2
 name:          opencv-extra
 version:       0.2.0.1
 homepage:      https://github.com/LumiGuide/haskell-opencv
 bug-reports:   https://github.com/LumiGuide/haskell-opencv/issues
-license:       BSD3
+license:       BSD-3-Clause
 license-file:  LICENSE
 author:        Roel van Dijk <[email protected]>, Bas van Dijk <[email protected]>
 maintainer:    Roel van Dijk <[email protected]>, Bas van Dijk <[email protected]>
 build-type:    Custom
-cabal-version: >=1.23
 category:      AI, Graphics
 synopsis:      Haskell binding to OpenCV-3.x extra modules
 description:   <<https://github.com/raw/LumiGuide/haskell-opencv/master/data/haskell-opencv-logo-200x82.png>>
@@ -75,8 +75,12 @@ library
           inline-c     >= 0.6
         , inline-c-cpp >= 0.2.1
 
-    cc-options: -Wall -std=c++11
-    ghc-options: -Wall -fwarn-incomplete-patterns -funbox-strict-fields -optc-std=c++11
+    cxx-options:       -std=c++11
+    extra-libraries:   stdc++
+    pkgconfig-depends: opencv >= 3.0.0
+
+    ghc-options: -Wall -fwarn-incomplete-patterns -funbox-strict-fields
+
     if flag(internal-documentation)
         cpp-options: -DENABLE_INTERNAL_DOCUMENTATION
 
@@ -122,8 +126,6 @@ library
         TypeOperators
 
     default-language:   Haskell2010
-    pkgconfig-depends:  opencv >= 3.0.0
-    extra-libraries:    stdc++
 
 test-suite doc-images-opencv-extra
     type: exitcode-stdio-1.0

opencv-examples/opencv-examples.nix

@@ -1,13 +1,13 @@
+cabal-version: 2.2
 name:          opencv
 version:       0.0.2.1
 homepage:      https://github.com/LumiGuide/haskell-opencv
 bug-reports:   https://github.com/LumiGuide/haskell-opencv/issues
-license:       BSD3
+license:       BSD-3-Clause
 license-file:  LICENSE
 author:        Roel van Dijk <[email protected]>, Bas van Dijk <[email protected]>
 maintainer:    Roel van Dijk <[email protected]>, Bas van Dijk <[email protected]>
 build-type:    Custom
-cabal-version: >=1.23
 category:      AI, Graphics
 synopsis:      Haskell binding to OpenCV-3.x
 description:   <<https://github.com/raw/LumiGuide/haskell-opencv/master/data/haskell-opencv-logo-200x82.png>>
@@ -107,8 +107,12 @@ library
           inline-c     >= 0.6
         , inline-c-cpp >= 0.2.1
 
-    cc-options: -Wall -std=c++11
-    ghc-options: -Wall -fwarn-incomplete-patterns -funbox-strict-fields -optc-std=c++11
+    cxx-options:       -std=c++11
+    extra-libraries:   stdc++
+    pkgconfig-depends: opencv >= 3.0.0
+
+    ghc-options: -Wall -fwarn-incomplete-patterns -funbox-strict-fields
+
     if flag(internal-documentation)
         cpp-options: -DENABLE_INTERNAL_DOCUMENTATION
 
@@ -225,9 +229,7 @@ library
         TypeFamilies
         TypeOperators
 
-    default-language:   Haskell2010
-    pkgconfig-depends:  opencv >= 3.0.0
-    extra-libraries:    stdc++
+    default-language: Haskell2010
 
 test-suite doc-images-opencv
     type: exitcode-stdio-1.0