Unverified Commit 65cd1309 authored by Pascal Wittmann's avatar Pascal Wittmann Committed by GitHub
Browse files

Merge pull request #279441 from wegank/fira-refactor 

fira: refactor
parents bcd0b9f0 4d22cc50

pkgs/data/fonts/fira/default.nix→pkgs/by-name/fi/fira-sans/package.nix

+8 −12
Original line number Diff line number Diff line 
{ 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

  '';

pkgs/by-name/fi/fira/package.nix

0 → 100644
+23 −0
Original line number Diff line number Diff line 
{ 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;

  };

}

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -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;















  };