fetch{cvs,svn}: Hack around splicing annoyance

If too many things don't eval because of cycles or whatever, splicing
breaks down.
This commit is contained in:
John Ericson 2020-04-19 16:03:58 -04:00 committed by Alyssa Ross
parent 7e281bea44
commit 0cbf687e07
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0

View File

@ -375,7 +375,10 @@ in
fetchbzr = callPackage ../build-support/fetchbzr { }; fetchbzr = callPackage ../build-support/fetchbzr { };
fetchcvs = callPackage ../build-support/fetchcvs { }; fetchcvs = if stdenv.buildPlatform != stdenv.hostPlatform
# hack around splicing being crummy with things that (correctly) don't eval.
then buildPackages.fetchcvs
else callPackage ../build-support/fetchcvs { };
fetchdarcs = callPackage ../build-support/fetchdarcs { }; fetchdarcs = callPackage ../build-support/fetchdarcs { };
@ -427,7 +430,10 @@ in
fetchs3 = callPackage ../build-support/fetchs3 { }; fetchs3 = callPackage ../build-support/fetchs3 { };
fetchsvn = callPackage ../build-support/fetchsvn { }; fetchsvn = if stdenv.buildPlatform != stdenv.hostPlatform
# hack around splicing being crummy with things that (correctly) don't eval.
then buildPackages.fetchsvn
else callPackage ../build-support/fetchsvn { };
fetchsvnrevision = import ../build-support/fetchsvnrevision runCommand subversion; fetchsvnrevision = import ../build-support/fetchsvnrevision runCommand subversion;