git.iko.soy/typeable/cabal2nix
on master help sign in
src/Cabal2Nix/Normalize.hs: ensure that any and all builds we perform has 'Cabal' as a build input
3e8bc6aPeter Simons
src/Cabal2Nix/Normalize.hs+1−1
compare with master
unifiedsplit
@@ -10,7 +10,7 @@ import Data.Char
10
10
11normalize :: Derivation -> Derivation
11normalize :: Derivation -> Derivation
12normalize deriv@(MkDerivation {..}) = deriv
12normalize deriv@(MkDerivation {..}) = deriv
13− { buildDepends = normalizeNixNames (filter (`notElem` (pname : corePackages)) $ buildDepends)
13+ { buildDepends = normalizeNixNames (filter (`notElem` (pname : corePackages)) $ ("Cabal" : buildDepends))
14 , buildTools = normalizeNixBuildTools (filter (`notElem` coreBuildTools) $ buildTools)
14 , buildTools = normalizeNixBuildTools (filter (`notElem` coreBuildTools) $ buildTools)
15 , extraLibs = normalizeNixLibs extraLibs
15 , extraLibs = normalizeNixLibs extraLibs
16 , pkgConfDeps = normalizeNixLibs pkgConfDeps
16 , pkgConfDeps = normalizeNixLibs pkgConfDeps