haskell.nix.diff

diff --git a/builder/comp-builder.nix b/builder/comp-builder.nix
index 934a868..00c94f1 100644
--- a/builder/comp-builder.nix
+++ b/builder/comp-builder.nix
@@ -31,6 +31,7 @@ let self =
 
 , dontPatchELF ? component.dontPatchELF
 , dontStrip ? component.dontStrip
+, hardeningDisable ? component.hardeningDisable
 
 , enableStatic ? component.enableStatic
 , enableShared ? ghc.enableShared && component.enableShared && !haskellLib.isCrossHost
@@ -376,5 +377,9 @@ let
     inherit
       preBuild postBuild
       preInstall postInstall;
-  });
+  }
+  // lib.optionalAttrs (builtins.trace hardeningDisable false) {
+    hardeningDisable = [ "bindnow" ];
+  }
+  );
 in drv; in self)
diff --git a/lib/pkgconf-nixpkgs-map.nix b/lib/pkgconf-nixpkgs-map.nix
index 0628ca1..d3829fa 100644
--- a/lib/pkgconf-nixpkgs-map.nix
+++ b/lib/pkgconf-nixpkgs-map.nix
@@ -106,6 +106,7 @@ pkgs:
     "notify"                             = [ pkgs."libnotify" ];
     "odbc"                               = [ pkgs."unixODBC" ];
     "openblas"                           = [ pkgs."openblasCompat" ];
+    "opencv"                             = [ pkgs."opencv3" ];
     "panelw"                             = [ pkgs."ncurses" ];
     "pangocairo"                         = [ pkgs."pango" ];
     "pcap"                               = [ pkgs."libpcap" ];
diff --git a/modules/plan.nix b/modules/plan.nix
index c24e695..14a0ac4 100644
--- a/modules/plan.nix
+++ b/modules/plan.nix
@@ -220,6 +220,10 @@ let
       type = nullOr uniqueStr;
       default = getDefaultOrNull def "postHaddock";
     };
+    hardeningDisable = mkOption {
+      type = listOfFilteringNulls str;
+      default = (def.hardeningDisable or []);
+    };
   };