git.iko.soy/typeable/cabal2nix
on master help sign in
PostProcess.hs: rename obsolete 'cabalInstall' to 'cabal-install'
df3c35dPeter Simons
src/Cabal2Nix/PostProcess.hs+1−1
compare with master
unifiedsplit
@@ -19,7 +19,7 @@ postProcess deriv@(MkDerivation {..})
19 | pname == "bindings-GLFW" = deriv { extraLibs = "libXext":"libXfixes":extraLibs }
19 | pname == "bindings-GLFW" = deriv { extraLibs = "libXext":"libXfixes":extraLibs }
20 | pname == "bits-extras" = deriv { configureFlags = "--ghc-option=-lgcc_s":configureFlags, extraLibs = filter (/= "gcc_s") extraLibs }
20 | pname == "bits-extras" = deriv { configureFlags = "--ghc-option=-lgcc_s":configureFlags, extraLibs = filter (/= "gcc_s") extraLibs }
21 | pname == "Cabal" = deriv { phaseOverrides = "preCheck = \"unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP\";" }
21 | pname == "Cabal" = deriv { phaseOverrides = "preCheck = \"unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP\";" }
22− | pname == "cabal-bounds" = deriv { buildTools = "cabalInstall":buildTools }
22+ | pname == "cabal-bounds" = deriv { buildTools = "cabal-install":buildTools }
23 | pname == "cabal-install" && version >= Version [0,14] []
23 | pname == "cabal-install" && version >= Version [0,14] []
24 = deriv { phaseOverrides = cabalInstallPostInstall }
24 = deriv { phaseOverrides = cabalInstallPostInstall }
25 | pname == "cairo" = deriv { extraLibs = "pkgconfig":"libc":"cairo":"zlib":extraLibs }
25 | pname == "cairo" = deriv { extraLibs = "pkgconfig":"libc":"cairo":"zlib":extraLibs }