1 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/applications/misc/pdfstudio/common.nix b/pkgs/applications/misc/pdfstudio/common.nix
index 047d9e4190fcb..8d4f7866b8d35 100644
--- a/pkgs/applications/misc/pdfstudio/common.nix
+++ b/pkgs/applications/misc/pdfstudio/common.nix
@@ -1,11 +1,13 @@
 { pname
+, program
 , src
 , year
 , version
 , desktopName
 , longDescription
 , buildFHSUserEnv
-, extraBuildInputs ? []
+, extraBuildInputs ? [ ]
+, jdk
 , stdenv
 , lib
 , dpkg
@@ -14,7 +16,6 @@
 , autoPatchelfHook
 , sane-backends
 , cups
-, jdk11
 }:
 let
   thisPackage = stdenv.mkDerivation rec {
@@ -23,7 +24,6 @@ let
 
     buildInputs = [
       sane-backends #for libsane.so.1
-      jdk11
     ] ++ extraBuildInputs;
 
     nativeBuildInputs = [
@@ -34,33 +34,33 @@ let
 
     desktopItems = [
       (makeDesktopItem {
-        name = "${pname}${year}";
+        name = "${pname}";
         desktopName = desktopName;
         genericName = "View and edit PDF files";
         exec = "${pname} %f";
-        icon = "${pname}${year}";
+        icon = "${pname}";
         comment = "Views and edits PDF files";
         mimeTypes = [ "application/pdf" ];
         categories = [ "Office" ];
       })
     ];
 
-    unpackCmd = "dpkg-deb -x $src ./${pname}-${version}";
+    unpackCmd = "dpkg-deb -x $src ./${program}-${version}";
     dontBuild = true;
 
     postPatch = ''
-      substituteInPlace opt/${pname}${year}/${pname}${year} --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk11.out}"
-      substituteInPlace opt/${pname}${year}/updater --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk11.out}"
+      substituteInPlace opt/${program}${year}/${program}${year} --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk.out}"
+      substituteInPlace opt/${program}${year}/updater --replace "# INSTALL4J_JAVA_HOME_OVERRIDE=" "INSTALL4J_JAVA_HOME_OVERRIDE=${jdk.out}"
     '';
 
     installPhase = ''
       runHook preInstall
 
       mkdir -p $out/{bin,share/pixmaps}
-      rm -rf opt/${pname}${year}/jre
-      cp -r opt/${pname}${year} $out/share/
-      ln -s $out/share/${pname}${year}/.install4j/${pname}${year}.png  $out/share/pixmaps/
-      ln -s $out/share/${pname}${year}/${pname}${year} $out/bin/${pname}
+      rm -rf opt/${program}${year}/jre
+      cp -r opt/${program}${year} $out/share/
+      ln -s $out/share/${program}${year}/.install4j/${program}${year}.png  $out/share/pixmaps/${pname}.png
+      ln -s $out/share/${program}${year}/${program}${year} $out/bin/
 
       runHook postInstall
     '';
@@ -74,7 +74,7 @@ buildFHSUserEnv {
     cups
     thisPackage
   ];
-  runScript = pname;
+  runScript = "${program}${year}";
 
   # link desktop item and icon into FHS user environment
   extraInstallCommands = ''