From 2905d2a32083c1028996b3db9bd8297906b390c2 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sat, 24 Sep 2022 09:41:02 +0200 Subject: [PATCH 1/3] envypn-font: rename name to pname&version --- pkgs/data/fonts/envypn-font/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index dbfb85f881f..4cc001f2e70 100644 --- a/pkgs/data/fonts/envypn-font/default.nix +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -2,11 +2,12 @@ , fonttosfnt, mkfontscale }: -stdenv.mkDerivation { - name = "envypn-font-1.7.1"; +stdenv.mkDerivation rec { + pname = "envypn-font"; + version = "1.7.1"; src = fetchurl { - url = "https://ywstd.fr/files/p/envypn-font/envypn-font-1.7.1.tar.gz"; + url = "https://ywstd.fr/files/p/envypn-font/envypn-font-${version}.tar.gz"; sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270"; }; From 6321bdbbab834599d4f0c6b997cc3fd795d6c938 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Tue, 4 Oct 2022 13:57:25 +0200 Subject: [PATCH 2/3] envypn-font: add pre and post hooks --- pkgs/data/fonts/envypn-font/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index 4cc001f2e70..f64c56f11e8 100644 --- a/pkgs/data/fonts/envypn-font/default.nix +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -18,16 +18,24 @@ stdenv.mkDerivation rec { ''; buildPhase = '' + runHook preBuild + # convert pcf fonts to otb for i in *e.pcf.gz; do faketime -f "1970-01-01 00:00:01" \ fonttosfnt -v -o "$(basename "$i" .pcf.gz)".otb "$i" done + + runHook postBuild ''; installPhase = '' + runHook preInstall + install -D -m 644 -t "$out/share/fonts/misc" *.otb *.pcf.gz mkfontdir "$out/share/fonts/misc" + + runHook postInstall ''; meta = with lib; { From fda0af137c285ea36df7264911e9bc11fba492d1 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Tue, 4 Oct 2022 13:57:40 +0200 Subject: [PATCH 3/3] envypn-font: add erdnaxe as maintainer --- pkgs/data/fonts/envypn-font/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index f64c56f11e8..c7e7935ffec 100644 --- a/pkgs/data/fonts/envypn-font/default.nix +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { homepage = "http://ywstd.fr/p/pj/#envypn"; license = licenses.miros; platforms = platforms.all; + maintainers = with maintainers; [ erdnaxe ]; }; }