git.iko.soy/typeable/cabal2nix
on master help sign in
Render src filepath correctly without quotes
commit1b92b21381962dc58797a8b4d59eeb4a4057059e authorBenno Fünfstück <benno.fuenfstueck@gmail.com> dateMon 6 Jan 2014, 19:04 (13 years ago) parent1a871eb
1 file changed+2−2
src/Distribution/NixOS/Derivation/Cabal.hs+2−2
src/Distribution/NixOS/Derivation/Cabal.hs+2−2
@@ -45,7 +45,7 @@ data Derivation = MkDerivation
4545 { pname :: String
4646 , version :: Version
4747 , sha256 :: Maybe String
48− , src :: Maybe String
48+ , src :: Maybe FilePath
4949 , isLibrary :: Bool
5050 , isExecutable :: Bool
5151 , buildDepends :: [String]
@@ -79,7 +79,7 @@ renderDerivation deriv = funargs (map text ("cabal" : inputs)) $$ vcat
7979 [ attr "pname" $ string (pname deriv)
8080 , attr "version" $ doubleQuotes (disp (version deriv))
8181 ] ++ maybeToList (fmap (attr "sha256" . string) $ sha256 deriv)
82− ++ maybeToList (fmap (attr "src" . string) $ src deriv)
82+ ++ maybeToList (fmap (attr "src" . text) $ src deriv)
8383 ++
8484 [ boolattr "isLibrary" (not (isLibrary deriv) || isExecutable deriv) (isLibrary deriv)
8585 , boolattr "isExecutable" (not (isLibrary deriv) || isExecutable deriv) (isExecutable deriv)