diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/build.nix | 14 | ||||
| -rw-r--r-- | nix/fontawesome.nix | 1 |
2 files changed, 11 insertions, 4 deletions
diff --git a/nix/build.nix b/nix/build.nix index e3b6f5f..0711760 100644 --- a/nix/build.nix +++ b/nix/build.nix @@ -1,14 +1,16 @@ -{ stdenvNoCC, buildAssets, nodePackages, fontawesome, ... }: +{ stdenvNoCC, buildAssets, nodePackages, fontawesome, haskellPackages, haskell, ... }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "www-assets"; - src = buildins.path { + version = "0.1.0.0"; + src = builtins.path { path = ../.; name = "assets"; }; nativeBuildInputs = [ buildAssets nodePackages.katex - fontaweoms + fontawesome + (haskell.lib.compose.justStaticExecutables haskellPackages.hjsmin) ]; phases = "installPhase"; @@ -17,6 +19,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { # javascript cp -r $src/js $out/js + chmod +rwx $out/js + for x in $out/js/*.js; do + hjsmin -i "$x" -o "''${x%.js}.min.js" + done # fontawesome mkdir -p $out/fontawesome @@ -25,5 +31,5 @@ stdenvNoCC.mkDerivation (finalAttrs: { # katex cp -r ${nodePackages.katex}/lib/node_modules/katex/dist $out/katex - '' + ''; }) diff --git a/nix/fontawesome.nix b/nix/fontawesome.nix index e824ace..6ac893f 100644 --- a/nix/fontawesome.nix +++ b/nix/fontawesome.nix @@ -5,6 +5,7 @@ in (fetchFromGitHub { owner = "FortAwesome"; repo = "Font-Awesome"; rev = version; + hash = "sha256-MaJG96kYj8ukJVyqOTDpkHH/eWr/ZlbVKk9AvJM7ub4="; }) // { inherit version; } |