diff --git a/pkgs/fhwa/fhwa.nix b/pkgs/fhwa/fhwa.nix deleted file mode 100644 index 7646e8e..0000000 --- a/pkgs/fhwa/fhwa.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs }: - with pkgs; - stdenv.mkDerivation rec { - name = "fhwa"; - version = "2020"; - src = requireFile { - name = "fhwaseries.tar.gz"; - url = ""; - sha256 = "fac52a7971f8a4a6abea45676bf7bffb142879c53166e42bdfe157b44c1210e5"; - }; - # sourceRoot = "fonts/ttf"; - - installPhase = '' - tar -xvf $src - mkdir -p $out/share/fonts/opentype - cp fonts/*.otf $out/share/fonts/opentype - ''; - } diff --git a/pkgs/fhwa/fhwaseries.tar.gz b/pkgs/fhwa/fhwaseries.tar.gz deleted file mode 100644 index 1741da8..0000000 Binary files a/pkgs/fhwa/fhwaseries.tar.gz and /dev/null differ diff --git a/pkgs/fhwa/flake.nix b/pkgs/fhwa/flake.nix deleted file mode 100644 index b99f76d..0000000 --- a/pkgs/fhwa/flake.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - description = "Flake containing FHWA font"; - - outputs = { self, nixpkgs }: { - - packages.x86_64-linux.fhwa = - let pkgs = import nixpkgs { system = "x86_64-linux"; }; - in pkgs.callPackage ./fhwa.nix {}; - - packages.x86_64-linux.default = self.packages.x86_64-linux.fhwa; - - }; -} diff --git a/pkgs/fhwa/flake.lock b/pkgs/highway-gothic/flake.lock similarity index 69% rename from pkgs/fhwa/flake.lock rename to pkgs/highway-gothic/flake.lock index 14c1cd1..02ecf32 100644 --- a/pkgs/fhwa/flake.lock +++ b/pkgs/highway-gothic/flake.lock @@ -3,8 +3,8 @@ "nixpkgs": { "locked": { "lastModified": 0, - "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", - "path": "/nix/store/m5i890m2g4pnyflpn48d1dpzzmwp5q4p-source", + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "path": "/nix/store/801l7gvdz7yaibhjsxqx82sc7zkakjbq-source", "type": "path" }, "original": { diff --git a/pkgs/highway-gothic/flake.nix b/pkgs/highway-gothic/flake.nix new file mode 100644 index 0000000..91c6e7b --- /dev/null +++ b/pkgs/highway-gothic/flake.nix @@ -0,0 +1,13 @@ +{ + description = "Flake containing Highway Gothic font"; + + outputs = { self, nixpkgs }: { + + packages.x86_64-linux.highway-gothic = + let pkgs = import nixpkgs { system = "x86_64-linux"; }; + in pkgs.callPackage ./highway-gothic.nix {}; + + packages.x86_64-linux.default = self.packages.x86_64-linux.highway-gothic; + + }; +} diff --git a/pkgs/highway-gothic/highway-gothic.nix b/pkgs/highway-gothic/highway-gothic.nix new file mode 100644 index 0000000..e70bd1f --- /dev/null +++ b/pkgs/highway-gothic/highway-gothic.nix @@ -0,0 +1,18 @@ +{ pkgs }: + with pkgs; + stdenv.mkDerivation rec { + name = "highway-gothic"; + version = "1.0.0"; + src = requireFile { + name = "highway-gothic.tar.gz"; + url = ""; + sha256 = "1e627dc5b5753d1396e92cb225edaa0f5bb769f17c1669ca90469cf52865a9bb"; + }; + # sourceRoot = "fonts/ttf"; + + installPhase = '' + tar -xvf $src + mkdir -p $out/share/fonts/truetype + cp fonts/*.ttf $out/share/fonts/truetype + ''; + } diff --git a/pkgs/highway-gothic/highway-gothic.tar.gz b/pkgs/highway-gothic/highway-gothic.tar.gz new file mode 100644 index 0000000..0070e38 Binary files /dev/null and b/pkgs/highway-gothic/highway-gothic.tar.gz differ