git.iko.soy/typeable/cabal2nix
on master help sign in
Merge pull request #300 from pbogdan/agda-fix-post-install
e5c3d07Peter Simons
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+2−2
compare with master
unifiedsplit
@@ -235,7 +235,7 @@ xmonadPostInstall = unlines
235agdaPostInstall :: String
235agdaPostInstall :: String
236agdaPostInstall = unlines
236agdaPostInstall = unlines
237 [ "postInstall = ''"
237 [ "postInstall = ''"
238− , " $out/bin/agda -c --no-main $(find $out/share -name Primitive.agda)"
238+ , " $out/bin/agda -c --no-main $(find $data/share -name Primitive.agda)"
239 , " $out/bin/agda-mode compile"
239 , " $out/bin/agda-mode compile"
240 , "'';"
240 , "'';"
241 ]
241 ]
@@ -243,7 +243,7 @@ agdaPostInstall = unlines
243agda25PostInstall :: String
243agda25PostInstall :: String
244agda25PostInstall = unlines
244agda25PostInstall = unlines
245 [ "postInstall = ''"
245 [ "postInstall = ''"
246− , " files=(\"$out/share/\"*\"-ghc-\"*\"/Agda-\"*\"/lib/prim/Agda/\"{Primitive.agda,Builtin\"/\"*.agda})"
246+ , " files=(\"$data/share/ghc-\"*\"/\"*\"-ghc-\"*\"/Agda-\"*\"/lib/prim/Agda/\"{Primitive.agda,Builtin\"/\"*.agda})"
247 -- Separate loops to avoid internal error
247 -- Separate loops to avoid internal error
248 , " for f in \"''${files[@]}\" ; do"
248 , " for f in \"''${files[@]}\" ; do"
249 , " $out/bin/agda $f"
249 , " $out/bin/agda $f"