From 2acaf53749d8e577e380045bacf78bf4dddbdd81 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 26 Sep 2023 21:03:33 +0800 Subject: [PATCH 1/2] circle-flags: init at 2.7.0 --- pkgs/by-name/ci/circle-flags/package.nix | 36 ++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/ci/circle-flags/package.nix diff --git a/pkgs/by-name/ci/circle-flags/package.nix b/pkgs/by-name/ci/circle-flags/package.nix new file mode 100644 index 000000000000..eed82fbdbb47 --- /dev/null +++ b/pkgs/by-name/ci/circle-flags/package.nix @@ -0,0 +1,36 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, nix-update-script +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "circle-flags"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "HatScripts"; + repo = "circle-flags"; + rev = "v${finalAttrs.version}"; + hash = "sha256-/+f5MDRW+tRH+jMtl3XuVPBShgy2PlD3NY+74mJa2Qk="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + mv flags $out/share/circle-flags-svg + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://github.com/HatScripts/circle-flags"; + description = "Collection of 400+ minimal circular SVG country and state flags"; + license = licenses.mit; + maintainers = with maintainers; [ bobby285271 ]; + platforms = platforms.all; + }; +}) From 7148877c114fb9c4727724ddd2f07b3efb6efa90 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 26 Sep 2023 21:07:18 +0800 Subject: [PATCH 2/2] hypnotix: Add missing circles-flags This fixes the log spam of "Couldn't find flag /usr/share/circle-flags-svg/xx.svg" and adds missing icons to the location list. --- pkgs/applications/video/hypnotix/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index b94acdecc54f..74d2389fce7b 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , substituteAll , cinnamon +, circle-flags , gettext , gobject-introspection , mpv @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace usr/lib/hypnotix/hypnotix.py \ --replace __DEB_VERSION__ ${version} \ + --replace /usr/share/circle-flags-svg ${circle-flags}/share/circle-flags-svg \ --replace /usr/share/hypnotix $out/share/hypnotix '';