From ac4c1c99b7f3d28be54a52b32d147bd80e41d1b3 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 26 Apr 2026 06:47:23 +0200 Subject: [PATCH 1/3] lilex: use installFonts c --- pkgs/by-name/li/lilex/package.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/li/lilex/package.nix b/pkgs/by-name/li/lilex/package.nix index 138d5e591d54..db6a881315f7 100644 --- a/pkgs/by-name/li/lilex/package.nix +++ b/pkgs/by-name/li/lilex/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchurl, + installFonts, unzip, }: stdenvNoCC.mkDerivation rec { @@ -13,7 +14,15 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-NDEO20unSfdy1CuI4+7EpjGFJ+dc7qqWz8VW7jU2b7w="; }; - nativeBuildInputs = [ unzip ]; + outputs = [ + "out" + "webfont" + ]; + + nativeBuildInputs = [ + installFonts + unzip + ]; unpackPhase = '' runHook preUnpack @@ -21,12 +30,6 @@ stdenvNoCC.mkDerivation rec { runHook postUnpack ''; - installPhase = '' - runHook preInstall - find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} + - runHook postInstall - ''; - meta = { description = "Open source programming font"; homepage = "https://github.com/mishamyrt/Lilex"; From c83b46d1fa162d9bdfab8b0e6f5ac0e4eb49c840 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 26 Apr 2026 06:48:25 +0200 Subject: [PATCH 2/3] lilex: remove unpackPhase with sourceRoot --- pkgs/by-name/li/lilex/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/lilex/package.nix b/pkgs/by-name/li/lilex/package.nix index db6a881315f7..45532c0eef9a 100644 --- a/pkgs/by-name/li/lilex/package.nix +++ b/pkgs/by-name/li/lilex/package.nix @@ -14,6 +14,8 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-NDEO20unSfdy1CuI4+7EpjGFJ+dc7qqWz8VW7jU2b7w="; }; + sourceRoot = "."; + outputs = [ "out" "webfont" @@ -24,12 +26,6 @@ stdenvNoCC.mkDerivation rec { unzip ]; - unpackPhase = '' - runHook preUnpack - unzip $src - runHook postUnpack - ''; - meta = { description = "Open source programming font"; homepage = "https://github.com/mishamyrt/Lilex"; From 479b3ead8811c346ba9fc372c4f15eed580fb73b Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 26 Apr 2026 06:48:52 +0200 Subject: [PATCH 3/3] lilex: use finalAttrs --- pkgs/by-name/li/lilex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lilex/package.nix b/pkgs/by-name/li/lilex/package.nix index 45532c0eef9a..abe21e68e097 100644 --- a/pkgs/by-name/li/lilex/package.nix +++ b/pkgs/by-name/li/lilex/package.nix @@ -5,12 +5,12 @@ installFonts, unzip, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "lilex"; version = "2.700"; src = fetchurl { - url = "https://github.com/mishamyrt/Lilex/releases/download/${version}/Lilex.zip"; + url = "https://github.com/mishamyrt/Lilex/releases/download/${finalAttrs.version}/Lilex.zip"; hash = "sha256-NDEO20unSfdy1CuI4+7EpjGFJ+dc7qqWz8VW7jU2b7w="; }; @@ -33,4 +33,4 @@ stdenvNoCC.mkDerivation rec { maintainers = with lib.maintainers; [ redyf ]; platforms = lib.platforms.all; }; -} +})