update nix

awnion · Oct 7, 2024 · f57eea7 · f57eea7
1 parent 1222848
commit f57eea7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -13,3 +13,6 @@ insert_final_newline = true
 
 [*.y{,a}ml]
 indent_size = 2
+
+[*.nix]
+indent_size = 2
diff --git a/flake.nix b/flake.nix
@@ -9,11 +9,6 @@
       url = "github:be5invis/Iosevka?shallow=1";
       flake = false;
     };
-
-    # font_config = {
-    #   url = "./private-build-plans.toml";
-    #   flake = false;
-    # };
   };
 
   outputs = { self, nixpkgs, flake-utils, font_src, ... }@inputs: flake-utils.lib.eachDefaultSystem (system:
@@ -25,25 +20,27 @@
         default = pkgs.stdenv.mkDerivation {
           name = "afio";
           buildInputs = with pkgs; [
-            qt5.qmake
-            qt5.qtbase
+            # qt5.qmake
+            # qt5.qtbase
             cacert
-            ttfautohint
-            nodejs
-            nodePackages.pnpm
+            ttfautohint-nox
+            nodejs_22
+            # nodePackages.pnpm
           ];
 
           src = font_src;
 
           buildPhase = ''
             cp -v ${./private-build-plans.toml} private-build-plans.toml
-            pnpm i
-            npm run build -- ttf::afio
+            npm i
+            npm run build ttf::afio
           '';
           installPhase = ''
             mkdir -p $out/
+            mkdir -p $out/share
+            cp -r * $out/share/
             ls -la > $out/ls.txt
-            cp -avL dist/*/ttf/* $out
+            # cp -avL dist/*/ttf/* $out
           '';
         };
       };