Fix debug builds

Author: hamishmack

builder/comp-builder.nix

@@ -110,8 +110,8 @@ let
 
   ghc = (if enableDWARF then (x: x.dwarf) else (x: x)) (
         (if smallAddressSpace then (x: x.smallAddressSpace) else (x: x)) defaults.ghc);
-  setup = (if enableDWARF then (x: x.dwarf) else (x: x)) (
-        (if smallAddressSpace then (x: x.smallAddressSpace) else (x: x)) drvArgs.setup);
+  setup = (if enableDWARF then (x: x.dwarf or x) else (x: x)) (
+          (if smallAddressSpace then (x: x.smallAddressSpace or x) else (x: x)) drvArgs.setup);
 
   # TODO fix cabal wildcard support so hpack wildcards can be mapped to cabal wildcards
   canCleanSource = !(cabal-generator == "hpack" && !(package.cleanHpack or false));
@@ -285,7 +285,7 @@ let
 
       enableParallelBuilding = true;
 
-      SETUP_HS = setup;
+      SETUP_HS = setup + (if setup.isCabal or false then "/bin/cabal act-as-setup --build-type=Simple --" else "/bin/Setup");
 
       inherit cabalFile;
       passAsFile = [ "cabalFile" ];

builder/hspkg-builder.nix

@@ -35,7 +35,7 @@ let
 
   setup = if package.buildType == "Simple"
     then
-      buildPackages.haskell-nix.nix-tools-unchecked.exes.cabal + "/bin/cabal act-as-setup --build-type=Simple --"
+      buildPackages.haskell-nix.nix-tools-unchecked.exes.cabal // { isCabal = true; }
     else setup-builder ({
       component = components.setup // {
         depends = config.setup-depends ++ components.setup.depends ++ package.setup-depends;
@@ -46,7 +46,7 @@ let
       inherit (pkg) preUnpack postUnpack prePatch postPatch;
     } // lib.optionalAttrs (package.buildType != "Custom") {
       nonReinstallablePkgs = ["base" "Cabal"];
-    }) + "/bin/Setup";
+    });
 
   buildComp = allComponent: componentId: component: comp-builder {
     inherit allComponent componentId component package name src flags setup cabalFile cabal-generator patches