on master help sign in
default.nix: only provide backend and ghcjs frontend to server
commit9861b43228aff80517c730b31282667328142a1b authorAli Abrar <aliabrar@gmail.com> dateWed 9 May 2018, 15:40 (8 years ago) parent4bfbce3
1 file changed+5−5
default.nix+5−5
default.nix+5−5
@@ -111,13 +111,12 @@ rec {
111111 touch "$out"
112112 obelisk-asset-manifest-generate "$src" "$haskellManifest" ${packageName} ${moduleName} "$symlinked"
113113 '';
114− serverExe = exe: assets: config:
114+ serverExe = backend: frontend: assets: config:
115115 pkgs.runCommand "serverExe" {} ''
116116 mkdir $out
117117 set -eux
118− ln -s "${exe}"/* $out/
119− ln -s $out/ghc/backend/bin/backend $out/
120− ln -s $out/ghcjs/frontend/bin/frontend.jsexe $out/
118+ ln -s "${backend}"/bin/backend $out/backend
119+ ln -s ${frontend}/bin/frontend.jsexe $out/frontend.jsexe
121120 ln -s "${assets}" $out/static
122121 ln -s "${config}" $out/config
123122 '';
@@ -221,7 +220,8 @@ rec {
221220 in mkProject (projectDefinition args));
222221 in projectOut //
223222 { server = { hostName }:
224− server (serverExe projectOut.all assets.symlinked configPath) hostName;
223+ let exe = serverExe projectOut.ghc.backend projectOut.ghcjs.frontend assets.symlinked configPath;
224+ in server exe hostName;
225225 };
226226 haskellPackageSets = {
227227 ghc = reflex-platform.ghc.override {