diff --git a/pkgs/default.nix b/pkgs/default.nix index acbdccc..dc12cfd 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,11 +1,11 @@ # Custom packages, that can be defined similarly to ones from nixpkgs # You can build them using 'nix build .#example' {pkgs, ...}: rec { - iosevka-lyte-term = pkgs.callPackage ./iosevka-lyte-term.nix {inherit (pkgs) iosevka;}; - iosevka-lyte-term-min = pkgs.callPackage ./iosevka-lyte-term-min.nix { + iosevka-lyteterm = pkgs.callPackage ./iosevka-lyteterm.nix {inherit (pkgs) iosevka;}; + iosevka-lyteterm-min = pkgs.callPackage ./iosevka-lyteterm-min.nix { inherit pkgs; inherit (pkgs) brotli; - inherit iosevka-lyte-term; + inherit iosevka-lyteterm; fonttools = pkgs.python311Packages.fonttools; }; # example = pkgs.callPackage ./example { }; diff --git a/pkgs/iosevka-lyte-term-min.nix b/pkgs/iosevka-lyteterm-min.nix similarity index 78% rename from pkgs/iosevka-lyte-term-min.nix rename to pkgs/iosevka-lyteterm-min.nix index f13279c..6beb512 100644 --- a/pkgs/iosevka-lyte-term-min.nix +++ b/pkgs/iosevka-lyteterm-min.nix @@ -2,15 +2,15 @@ pkgs, fonttools, brotli, - iosevka-lyte-term, + iosevka-lyteterm, ... }: let - BASE_FONTS = "${iosevka-lyte-term}/share/fonts/truetype"; + BASE_FONTS = "${iosevka-lyteterm}/share/fonts/truetype"; in pkgs.stdenvNoCC.mkDerivation { inherit BASE_FONTS; - pname = "iosevka-lyte-term-min"; - version = iosevka-lyte-term.version; + pname = "iosevka-lyteterm-min"; + version = iosevka-lyteterm.version; # do I need to include makesubset.bash and subset-glyphs.txt? buildInputs = [fonttools brotli]; srcs = [ diff --git a/pkgs/iosevka-lyte-term.nix b/pkgs/iosevka-lyteterm.nix similarity index 95% rename from pkgs/iosevka-lyte-term.nix rename to pkgs/iosevka-lyteterm.nix index fc66e18..f947946 100644 --- a/pkgs/iosevka-lyte-term.nix +++ b/pkgs/iosevka-lyteterm.nix @@ -1,7 +1,7 @@ {iosevka, ...}: (iosevka.overrideAttrs (final: prev: { - pname = "iosevka-lyte-term"; + pname = "iosevka-lyteterm"; buildPhase = '' export HOME=$TMPDIR @@ -14,9 +14,11 @@ installPhase = '' runHook preInstall fontdir="$out/share/fonts" + ls -la "$pname" + ls -la "$pname/ttf"/* install -d "$fontdir" - install "dist/$pname/ttf"/* "$fontdir/truetype" - install "dist/$pname/woff2"/* "$fontdir/woff2" + install "$pname/ttf"/* "$fontdir/truetype" + install "$pname/woff2"/* "$fontdir/woff2" runHook postInstall ''; }))