b514363 · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

on master help sign in

Remove the cuda post-process hook, which is a total destaster of a hack.

b514363Peter Simons12 years ago

src/Cabal2Nix/PostProcess.hs−25

compare with master

unifiedsplit

@@ -22,7 +22,6 @@ postProcess deriv@(MkDerivation {..})

22 | pname == "cabal-bounds" = deriv { buildTools = "cabal-install":buildTools }

23 | pname == "cabal-install" && version >= Version [0,14] []

24 = deriv { phaseOverrides = cabalInstallPostInstall }

25− | pname == "cuda" = deriv { phaseOverrides = cudaConfigurePhase, extraLibs = "cudatoolkit":"nvidia_x11":"stdenv.cc":extraLibs }

26 | pname == "darcs" = deriv { phaseOverrides = darcsInstallPostInstall }

25 | pname == "darcs" = deriv { phaseOverrides = darcsInstallPostInstall }

27 | pname == "dns" = deriv { testTarget = "spec" }

26 | pname == "dns" = deriv { testTarget = "spec" }

28 | pname == "editline" = deriv { extraLibs = "libedit":extraLibs }

27 | pname == "editline" = deriv { extraLibs = "libedit":extraLibs }

@@ -101,30 +100,6 @@ postProcess deriv@(MkDerivation {..})

101 | pname == "xmonad" = deriv { phaseOverrides = xmonadPostInstall }

100 | pname == "xmonad" = deriv { phaseOverrides = xmonadPostInstall }

102 | otherwise = deriv

101 | otherwise = deriv

103

102

104−cudaConfigurePhase :: String

105−cudaConfigurePhase = unlines

106− [ "# The cudatoolkit provides both 64 and 32-bit versions of the"

107− , "# library. GHC's linker fails if the wrong version is found first."

108− , "# We solve this by eliminating lib64 from the path on 32-bit"

109− , "# platforms and putting lib64 first on 64-bit platforms."

110− , "configurePhase = ''"

111− , " for i in Setup.hs Setup.lhs; do"

112− , " test -f $i && ghc --make $i"

113− , " done"

114− , " for p in $extraBuildInputs $propagatedNativeBuildInputs; do"

115− , " if [ -d \"$p/include\" ]; then"

116− , " extraLibDirs=\"$extraLibDirs --extra-include-dir=$p/include\""

117− , " fi"

118− , " for d in ${if stdenv.is64bit then \"lib64 lib\" else \"lib\"}; do"

119− , " if [ -d \"$p/$d\" ]; then"

120− , " extraLibDirs=\"$extraLibDirs --extra-lib-dir=$p/$d\""

121− , " fi"

122− , " done"

123− , " done"

124− , " ./Setup configure --verbose --prefix=\"$out\" $libraryProfiling $extraLibDirs $configureFlags"

125− , "'';"

126− ]

127−

128ghcModPostInstall :: String -> Version -> String

103ghcModPostInstall :: String -> Version -> String

129ghcModPostInstall pname version = unlines

104ghcModPostInstall pname version = unlines

130 [ "configureFlags = \"--datasubdir=" ++ pname ++ "-" ++ display version ++ "\";"

105 [ "configureFlags = \"--datasubdir=" ++ pname ++ "-" ++ display version ++ "\";"