67addbb · obelisk · git.iko.soy

git.iko.soy/obelisk

on master help sign in

Don't use buildInputs to get closure-compiler

67addbbTom Smalley8 years ago

default.nix+2−4

compare with master

unifiedsplit

@@ -164,16 +164,14 @@ in rec {

164 obelisk-asset-manifest-generate "$src" "$haskellManifest" ${packageName} ${moduleName} "$symlinked"

165 '';

166

167− compressedJs = frontend: optimizationLevel: pkgs.runCommand "compressedJs" {

167+ compressedJs = frontend: optimizationLevel: pkgs.runCommand "compressedJs" {} ''

168− buildInputs = if optimizationLevel == null then [] else [ pkgs.closurecompiler ];

169− } ''

170 mkdir $out

168 mkdir $out

171 cd $out

169 cd $out

172 ln -s "${haskellLib.justStaticExecutables frontend}/bin/frontend.jsexe/all.js" all.unminified.js

170 ln -s "${haskellLib.justStaticExecutables frontend}/bin/frontend.jsexe/all.js" all.unminified.js

173 ${if optimizationLevel == null then ''

171 ${if optimizationLevel == null then ''

174 ln -s all.unminified.js all.js

172 ln -s all.unminified.js all.js

175 '' else ''

173 '' else ''

176− closure-compiler --externs "${reflex-platform.ghcjsExternsJs}" -O ${optimizationLevel} --jscomp_warning=checkVars --create_source_map="all.js.map" --source_map_format=V3 --js_output_file="all.js" all.unminified.js

174+ ${pkgs.closurecompiler}/bin/closure-compiler --externs "${reflex-platform.ghcjsExternsJs}" -O ${optimizationLevel} --jscomp_warning=checkVars --create_source_map="all.js.map" --source_map_format=V3 --js_output_file="all.js" all.unminified.js

177 echo "//# sourceMappingURL=all.js.map" >> all.js

175 echo "//# sourceMappingURL=all.js.map" >> all.js

178 ''}

176 ''}

179 '';

177 '';