From 312d081b6a8daf375ebace1c4d3a5af11449c806 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Oct 2013 14:56:31 +0200 Subject: [PATCH] pkgs/build-support/cabal: move current postFixup hook into installPhase to free up the postFixup hook for users to override Builds tend to override pre and post hooks for each phase, so we should not use them to perform regular build commands that cannot be omitted. --- pkgs/build-support/cabal/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 6794a7a4be1..fb3b6b99c4f 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -203,13 +203,11 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion; GHC_PACKAGE_PATH=$installedPkgConf ghc-pkg --global register $pkgConf --force fi - eval "$postInstall" - ''; - - postFixup = '' if test -f $out/nix-support/propagated-native-build-inputs; then ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages fi + + eval "$postInstall" ''; # We inherit stdenv and ghc so that they can be used