From 70123e0915b4d344ca5eee8b10da682602912d68 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sun, 19 May 2024 10:04:17 -0400 Subject: [PATCH] icoextract: use thumbnailer from upstream Fixes an issue where upstream updated the thumbnailer by fetching from GitHub instead of PyPI. --- .../ic/icoextract/exe-thumbnailer.thumbnailer | 3 --- pkgs/by-name/ic/icoextract/package.nix | 17 ++++++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 pkgs/by-name/ic/icoextract/exe-thumbnailer.thumbnailer diff --git a/pkgs/by-name/ic/icoextract/exe-thumbnailer.thumbnailer b/pkgs/by-name/ic/icoextract/exe-thumbnailer.thumbnailer deleted file mode 100644 index c275ac919b6b..000000000000 --- a/pkgs/by-name/ic/icoextract/exe-thumbnailer.thumbnailer +++ /dev/null @@ -1,3 +0,0 @@ -[Thumbnailer Entry] -Exec=@out@/bin/exe-thumbnailer -v -s %s %i %o -MimeType=application/x-ms-dos-executable;application/x-dosexec;application/x-msdownload diff --git a/pkgs/by-name/ic/icoextract/package.nix b/pkgs/by-name/ic/icoextract/package.nix index d1f585338545..99bb229db898 100644 --- a/pkgs/by-name/ic/icoextract/package.nix +++ b/pkgs/by-name/ic/icoextract/package.nix @@ -1,7 +1,7 @@ { lib, python3Packages, - fetchPypi, + fetchFromGitHub, }: python3Packages.buildPythonApplication rec { @@ -9,10 +9,11 @@ python3Packages.buildPythonApplication rec { version = "0.1.5"; pyproject = true; - src = fetchPypi { - inherit pname version; - extension = "tar.gz"; - hash = "sha256-/UxnWNyRNtwI4Rxx97i5QyjeMrUr5Sq+TfLTmU0xWyc="; + src = fetchFromGitHub { + owner = "jlu5"; + repo = "icoextract"; + rev = version; + hash = "sha256-McVG8966NCEpzc9biawLvUgbQUtterkIud/9GwOeltI="; }; build-system = with python3Packages; [ setuptools ]; @@ -28,8 +29,10 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "icoextract" ]; postInstall = '' - mkdir -p $out/share/thumbnailers - substituteAll ${./exe-thumbnailer.thumbnailer} $out/share/thumbnailers/exe-thumbnailer.thumbnailer + substituteInPlace exe-thumbnailer.thumbnailer \ + --replace Exec=exe-thumbnailer Exec=$out/bin/exe-thumbnailer + + install -Dm644 exe-thumbnailer.thumbnailer $out/share/thumbnailers ''; meta = with lib; {