public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix only the source folder is tagged now when creating tags for ghc-extra libraries 

svn path=/nixpkgs/trunk/; revision=11574
This commit is contained in:
Marc Weber 2008-04-11 15:26:51 +00:00
parent 4ca098cdbc
commit 6f08f0723d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/all-packages.nix
View File

@ -1362,7 +1362,7 @@ let pkgs = rec {
let buildInputs = (if (args ? buildInputs) then args.buildInputs else []) let buildInputs = (if (args ? buildInputs) then args.buildInputs else [])
++ [ ghcPkgUtil ] ++ ( if args ? pass && args.pass ? buildInputs then args.pass.buildInputs else []); ++ [ ghcPkgUtil ] ++ ( if args ? pass && args.pass ? buildInputs then args.pass.buildInputs else []);
in stdenv.mkDerivation ({ in stdenv.mkDerivation ({
goSrcDir = "cd ${srcDir}"; srcDir = if (args ? srcDir) then args.srcDir else ".";
inherit (args) name src propagatedBuildInputs; inherit (args) name src propagatedBuildInputs;
phases = "unpackPhase patchPhase buildPhase"; phases = "unpackPhase patchPhase buildPhase";
# TODO remove echo line # TODO remove echo line
@ -1370,7 +1370,7 @@ let pkgs = rec {
createEmptyPackageDatabaseAndSetupHook createEmptyPackageDatabaseAndSetupHook
export GHC_PACKAGE_PATH export GHC_PACKAGE_PATH
\$goSrcDir cd \$srcDir
ghc --make Setup.*hs -o setup ghc --make Setup.*hs -o setup
CABAL_SETUP=./setup CABAL_SETUP=./setup