Patch from input-output-hk#31

Author: ttuegel

builder/default.nix

@@ -57,7 +57,7 @@ in {
   # Build a Haskell package from its config.
   # TODO: this pkgs is the adjusted pkgs, but pkgs.pkgs is unadjusted
   build-package = haskellLib.weakCallPackage pkgs ./hspkg-builder.nix {
-    inherit haskellLib ghc buildGHC comp-builder setup-builder;
+    inherit haskellLib ghc buildGHC comp-builder setup-builder makeSetupConfigFiles;
   };
 
   inherit shellFor;

builder/hspkg-builder.nix

@@ -1,4 +1,4 @@
-{ pkgs, buildPackages, stdenv, lib, haskellLib, ghc, buildGHC, fetchurl, runCommand, comp-builder, setup-builder }:
+{ pkgs, buildPackages, stdenv, lib, haskellLib, ghc, buildGHC, fetchurl, runCommand, comp-builder, setup-builder, makeSetupConfigFiles }:
 
 
 { flags
@@ -12,6 +12,7 @@
 , revision
 , revisionSha256
 , patches
+, hardeningDisable
 
 , shellHook
 
@@ -30,22 +31,40 @@ let
     import Distribution.Simple
     main = defaultMain
   '';
-  defaultSetup = buildPackages.runCommand "default-Setup" { nativeBuildInputs = [buildGHC]; } ''
-    cat ${defaultSetupSrc} > Setup.hs
-    mkdir -p $out/bin
-    ${buildGHC.targetPrefix}ghc Setup.hs --make -o $out/bin/Setup
-  '';
+  defaultConfig = makeSetupConfigFiles {
+    inherit (package) identifier;
+    inherit (config) flags;
+    fullName = "${name}-setup";
+    component = {
+      depends = [];
+      libs = [];
+      frameworks = [];
+      doExactConfig = false;
+    };
+  };
+  defaultSetup =
+    buildPackages.runCommand
+      "default-Setup"
+      { nativeBuildInputs = [buildGHC];
+        CABAL_CONFIG = defaultConfig + /cabal.config;
+      }
+      ''
+        cat ${defaultSetupSrc} > Setup.hs
+        mkdir -p $out/bin
+        ${buildGHC.targetPrefix}ghc Setup.hs --make -o $out/bin/Setup
+      '';
 
   setup = if package.buildType == "Simple"
     then defaultSetup
     else setup-builder {
       setup-depends = package.setup-depends;
       inherit package name src flags;
+      postUnpack = config.postUnpack;
     };
 
   buildComp = componentId: component: comp-builder {
     inherit componentId component package name src flags setup cabalFile cabal-generator patches revision
-            shellHook
+            shellHook hardeningDisable
             ;
   };