c6e5cd0 · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

PostProcess.hs: avoid empty lines in cuda's configure phase override

Our pretty-printing library can't handle empty lines in a nested environment properly; the generated output has trailing whitespace. Ideally, this would be fixed on the pretty-printing level, but I don't know how, so we just avoid the issue for the time being.

commitc6e5cd0347cdd12f8d7e301dfadd957bd32df0c3 authorPeter Simons <simons@cryp.to> dateFri 8 Mar 2013, 12:55 (14 years ago) parentdeabc69

1 file changed−4

compare with master

unifiedsplit

src/Cabal2Nix/PostProcess.hs−4

src/Cabal2Nix/PostProcess.hs−4

@@ -65,14 +65,11 @@ cudaConfigurePhase = unlines

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

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

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

68− , ""

6968 , "libPaths = if self.stdenv.is64bit then \"lib64 lib\" else \"lib\";"

70− , ""

7169 , "configurePhase = ''"

7270 , " for i in Setup.hs Setup.lhs; do"

7371 , " test -f $i && ghc --make $i"

7472 , " done"

75− , ""

7673 , " for p in $extraBuildInputs $propagatedBuildNativeInputs; do"

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

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

@@ -83,7 +80,6 @@ cudaConfigurePhase = unlines

8380 , " fi"

8481 , " done"

8582 , " done"

86− , ""

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

8884 , "'';"

8985 ]