various: fixup leftover pixmaps references (#498325)

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
       '';

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

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 {} \;