From f57eea7172716fc4e9aed7e8548c921c3dcf6a8f Mon Sep 17 00:00:00 2001 From: Sergei Blinov Date: Mon, 7 Oct 2024 23:55:51 +0200 Subject: [PATCH] update nix --- .editorconfig | 3 +++ flake.nix | 23 ++++++++++------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.editorconfig b/.editorconfig index 623a58f..2a32c2e 100644 --- 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 index 01ea514..0e302fa 100644 --- 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 ''; }; };