From 6f08f0723d8f25da746a40fe808e92f9f9c593c4 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Fri, 11 Apr 2008 15:26:51 +0000 Subject: [PATCH] Fix only the source folder is tagged now when creating tags for ghc-extra libraries svn path=/nixpkgs/trunk/; revision=11574 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ce37af9a5c..3a6ea6282a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1362,7 +1362,7 @@ let pkgs = rec { let buildInputs = (if (args ? buildInputs) then args.buildInputs else []) ++ [ ghcPkgUtil ] ++ ( if args ? pass && args.pass ? buildInputs then args.pass.buildInputs else []); in stdenv.mkDerivation ({ - goSrcDir = "cd ${srcDir}"; + srcDir = if (args ? srcDir) then args.srcDir else "."; inherit (args) name src propagatedBuildInputs; phases = "unpackPhase patchPhase buildPhase"; # TODO remove echo line @@ -1370,7 +1370,7 @@ let pkgs = rec { createEmptyPackageDatabaseAndSetupHook export GHC_PACKAGE_PATH - \$goSrcDir + cd \$srcDir ghc --make Setup.*hs -o setup CABAL_SETUP=./setup