From d725ac794286e3464d80f5bce69da98ff4b2ebbf Mon Sep 17 00:00:00 2001 From: Isaac Shapira Date: Fri, 23 Apr 2021 13:55:38 -0600 Subject: Add haskell.lib.setBuiltTarget, and support non library compiling of a single target --- pkgs/development/haskell-modules/generic-builder.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/development/haskell-modules/generic-builder.nix') diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index faf80da0c7d..2f9127e30f3 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -464,7 +464,12 @@ stdenv.mkDerivation ({ installPhase = '' runHook preInstall - ${if !isLibrary then "${setupCommand} install" else '' + ${if !isLibrary && buildTarget == "" then "${setupCommand} install" + # ^^ if the project is not a library, and no build target is specified, we can just use "install". + else if !isLibrary then "${setupCommand} copy ${buildTarget}" + # ^^ if the project is not a library, and we have a build target, then use "copy" to install + # just the target specified; "install" will error here, since not all targets have been built. + else '' ${setupCommand} copy local packageConfDir="$out/lib/${ghc.name}/package.conf.d" local packageConfFile="$packageConfDir/${pname}-${version}.conf" -- cgit 1.4.1