From e8d36115f1eb996a7b47b7aaa4feb1fb12946065 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Mon, 9 Mar 2026 12:22:12 -0700 Subject: [PATCH] various: fixup leftover pixmaps references --- pkgs/applications/misc/diffpdf/default.nix | 4 ++-- pkgs/by-name/gp/gpsprune/package.nix | 2 +- pkgs/tools/graphics/nifskope/default.nix | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index b4730af82ae2..378d2a98d295 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { install -Dpm755 -D diffpdf $out/bin/diffpdf install -Dpm644 -D diffpdf.1 $out/share/man/man1/diffpdf.1 - install -dpm755 $out/share/doc/${pname}-${version} $out/share/licenses/${pname}-${version} $out/share/icons $out/share/pixmaps $out/share/applications + install -dpm755 $out/share/doc/${pname}-${version} $out/share/licenses/${pname}-${version} $out/share/icons $out/share/applications install -Dpm644 CHANGES README help.html $out/share/doc/${pname}-${version}/ install -Dpm644 gpl-2.0.txt $out/share/licenses/${pname}-${version}/ install -Dpm644 images/icon.png $out/share/icons/hicolor/64x64/apps/diffpdf.png @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { Name=diffpdf Icon=diffpdf Comment=PDF diffing tool - Exec=$out/bin/diffpdf + Exec=diffpdf Terminal=false EOF ''; diff --git a/pkgs/by-name/gp/gpsprune/package.nix b/pkgs/by-name/gp/gpsprune/package.nix index c5366b3c7fdd..e35506ef8ec3 100644 --- a/pkgs/by-name/gp/gpsprune/package.nix +++ b/pkgs/by-name/gp/gpsprune/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 ${finalAttrs.src} $out/share/java/gpsprune.jar makeWrapper ${jre}/bin/java $out/bin/gpsprune \ --add-flags "-jar $out/share/java/gpsprune.jar" - mkdir -p $out/share/pixmaps + mkdir -p $out/share/icons/hicolor/64x64/apps ${unzip}/bin/unzip -p $src tim/prune/gui/images/window_icon_64.png > $out/share/icons/hicolor/64x64/apps/gpsprune.png runHook postInstall diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index cf0429f3fa7c..db59bb81613c 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -70,8 +70,7 @@ stdenv.mkDerivation { cp ./install/linux-install/nifskope.desktop $out/share/applications substituteInPlace $out/share/applications/nifskope.desktop \ - --replace 'Exec=nifskope' "Exec=$out/bin/NifSkope" \ - --replace 'Icon=nifskope' "Icon=$out/share/pixmaps/nifskope.png" + --replace-fail 'Exec=nifskope' "Exec=NifSkope" \ find $out/share -type f -exec chmod -x {} \;