git.iko.soy/typeable/cabal2nix
on master help sign in
Merge pull request #300 from pbogdan/agda-fix-post-install

Agda: fix postInstall to account for multiple outputs.

commite5c3d076566ef3ca70a5d07219be9c331014c948 authorPeter Simons <simons@cryp.to> dateFri 1 Sep 2017, 14:25 (9 years ago) parentc55f1cad6a8019
1 file changed+2−2
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+2−2
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+2−2
@@ -235,7 +235,7 @@ xmonadPostInstall = unlines
235235agdaPostInstall :: String
236236agdaPostInstall = unlines
237237 [ "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)"
239239 , " $out/bin/agda-mode compile"
240240 , "'';"
241241 ]
@@ -243,7 +243,7 @@ agdaPostInstall = unlines
243243agda25PostInstall :: String
244244agda25PostInstall = unlines
245245 [ "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})"
247247 -- Separate loops to avoid internal error
248248 , " for f in \"''${files[@]}\" ; do"
249249 , " $out/bin/agda $f"