git.iko.soy/typeable/cabal2nix
on master help sign in
git-annex: support $BUILDER variable to make

git-annex-6.20160114 has renamed the $CABAL variable to $BUILDER. We simply set *both*, to ensure that our generated recipes can compile old and new versions of git-annex. The fix was contributed by @mdorman in https://github.com/peti/nixpkgs/pull/33.

commiteddefc235e5b4ac6a3a89508940553fa8801496b authorPeter Simons <simons@cryp.to> dateSun 17 Jan 2016, 10:42 (11 years ago) parent1064c43
1 file changed+1−1
compare with master
unifiedsplit
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1−1
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1−1
@@ -114,7 +114,7 @@ gitAnnexHook = set phaseOverrides gitAnnexOverrides . over (executableDepends .
114114 gitAnnexOverrides = unlines
115115 [ "preConfigure = \"export HOME=$TEMPDIR; patchShebangs .\";"
116116 , "postBuild = \"ln -sf dist/build/git-annex/git-annex git-annex\";"
117− , "installPhase = \"make PREFIX=$out CABAL=./Setup install\";"
117+ , "installPhase = \"make PREFIX=$out CABAL=./Setup BUILDER=./Setup install\";"
118118 , "checkPhase = \"./git-annex test\";"
119119 , "enableSharedExecutables = false;"
120120 ]