From 08d58ab5c0dca8ae1ac4a57f202882198822d131 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 9 Dec 2024 03:14:22 +0900 Subject: [PATCH] =?UTF-8?q?Backport=20nixpkgs:=20emoji=20is=20=20anyware?= =?UTF-8?q?=20=F0=9F=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/NixOS/nixpkgs/commit/5eafabf8dba1fd00fe3a6beb232c69b87b8f6095 Updated the channel in GH-982 --- nixos/desktop/font.nix | 3 ++- pkgs/beedii/package.nix | 32 -------------------------------- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 pkgs/beedii/package.nix diff --git a/nixos/desktop/font.nix b/nixos/desktop/font.nix index edf96b9b..46604004 100644 --- a/nixos/desktop/font.nix +++ b/nixos/desktop/font.nix @@ -30,7 +30,8 @@ ]) ++ [ # emoji - pkgs.my.beedii + # https://github.com/NixOS/nixpkgs/pull/349097 + pkgs.unstable.beedii ]; # Same as home-manager module? diff --git a/pkgs/beedii/package.nix b/pkgs/beedii/package.nix deleted file mode 100644 index 8112a20e..00000000 --- a/pkgs/beedii/package.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchzip, -}: - -stdenvNoCC.mkDerivation rec { - pname = "beedii"; - version = "1.0.0"; - - src = fetchzip { - url = "https://github.com/webkul/beedii/releases/download/v${version}/beedii.zip"; - hash = "sha256-MefkmWl7LdhQiePpixKcatoIeOTlrRaO3QA9xWAxJ4Q="; - stripRoot = false; - }; - - installPhase = '' - runHook preInstall - - install -Dm444 Fonts/*.ttf -t $out/share/fonts/truetype/${pname} - - runHook postInstall - ''; - - meta = with lib; { - description = "Free Hand Drawn Emoji Font"; - homepage = "https://github.com/webkul/beedii"; - license = licenses.cc0; - platforms = platforms.all; - maintainers = with maintainers; [ kachick ]; - }; -}