diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2024-04-19 11:15:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-19 11:15:46 +0200 |
commit | 65cd13090f2316d49547a1cc1f6991d2da85395b (patch) | |
tree | 852613646b66e1e53ff1c84597dbec18fa0f8eeb /pkgs | |
parent | bcd0b9f08d4fbb6dbb2c6501f57ff00fbe1256ce (diff) | |
parent | 4d22cc500f34560853d561d80f4aa980d98efd10 (diff) |
Merge pull request #279441 from wegank/fira-refactor
fira: refactor
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/by-name/fi/fira-mono/package.nix (renamed from pkgs/data/fonts/fira-mono/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/by-name/fi/fira-sans/package.nix (renamed from pkgs/data/fonts/fira/default.nix) | 20 | ||||
-rw-r--r-- | pkgs/by-name/fi/fira/package.nix | 23 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 31 insertions, 16 deletions
diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/by-name/fi/fira-mono/package.nix index 5d059dbf88e08..5d059dbf88e08 100644 --- a/pkgs/data/fonts/fira-mono/default.nix +++ b/pkgs/by-name/fi/fira-mono/package.nix diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/by-name/fi/fira-sans/package.nix index 4b79d14dd94e7..c07cc15c97cce 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/by-name/fi/fira-sans/package.nix @@ -1,20 +1,16 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ lib +, stdenvNoCC +, fira-mono +}: -stdenvNoCC.mkDerivation rec { - pname = "fira"; - version = "4.202"; - - src = fetchFromGitHub { - owner = "mozilla"; - repo = "Fira"; - rev = version; - hash = "sha256-HLReqgL0PXF5vOpwLN0GiRwnzkjGkEVEyOEV2Z4R0oQ="; - }; +stdenvNoCC.mkDerivation { + pname = "fira-sans"; + inherit (fira-mono) version src; installPhase = '' runHook preInstall - install --mode=-x -Dt $out/share/fonts/opentype otf/*.otf + install --mode=-x -Dt $out/share/fonts/opentype otf/FiraSans*.otf runHook postInstall ''; diff --git a/pkgs/by-name/fi/fira/package.nix b/pkgs/by-name/fi/fira/package.nix new file mode 100644 index 0000000000000..405189ba2e99f --- /dev/null +++ b/pkgs/by-name/fi/fira/package.nix @@ -0,0 +1,23 @@ +{ lib +, symlinkJoin +, fira-mono +, fira-sans +}: + +symlinkJoin rec { + pname = "fira"; + inherit (fira-mono) version; + name = "${pname}-${version}"; + + paths = [ + fira-mono + fira-sans + ]; + + meta = { + description = "Fira font family including Fira Sans and Fira Mono"; + homepage = "https://mozilla.github.io/Fira/"; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee91d43772551..e13755dc7f04c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28708,8 +28708,6 @@ with pkgs; fanwood = callPackage ../data/fonts/fanwood { }; - fira = callPackage ../data/fonts/fira { }; - fira-code = callPackage ../data/fonts/fira-code { }; fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { }; fira-code-nerdfont = nerdfonts.override { @@ -28718,8 +28716,6 @@ with pkgs; fira-go = callPackage ../data/fonts/fira-go { }; - fira-mono = callPackage ../data/fonts/fira-mono { }; - flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { inherit (plasma5Packages) breeze-icons; }; |