TO BE SQUASHED

Signed-off-by: jdev082 <[email protected]>
NixOS · Nov 13, 2024 · 6549d07 · 6549d07
1 parent 0f5986d
commit 6549d07
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/pkgs/by-name/ca/catalyst/package.nix b/pkgs/by-name/ca/catalyst/package.nix
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://github.com/CatalystDevOrg/Catalyst/releases/download/v${version}/catalyst-${version}.AppImage";
     hash = "sha256-6t1RAxmRc/1fAQT4Qnd42kh3cxgRZr74k8gwebTb0Ic=";
-    name = "${pname}-${version}.AppImage";
+    name = "catalyst-${version}.AppImage";
   };
 
 
   appimageContents = appimageTools.extractType2 {
-    name = "${pname}-${version}";
+    name = "catalyst-${version}";
     inherit src;
   };
 
@@ -37,11 +37,11 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/bin $out/share/${pname} $out/share/applications
-    mkdir -p $out/share/${pname}/resources/
+    mkdir -p $out/bin $out/share/catalyst $out/share/applications
+    mkdir -p $out/share/catalyst/resources/
 
-    cp -a ${appimageContents}/locales $out/share/${pname}
-    cp -a ${appimageContents}/catalyst.desktop $out/share/applications/${pname}.desktop
+    cp -a ${appimageContents}/locales $out/share/catalyst
+    cp -a ${appimageContents}/catalyst.desktop $out/share/applications/catalyst.desktop
     mkdir -p $out/share/pixmaps
     cp -r ${appimageContents}/usr/share/icons/hicolor/0x0/apps/catalyst.png $out/share/pixmaps/
     asar extract ${appimageContents}/resources/app.asar resources/
@@ -58,17 +58,17 @@ stdenv.mkDerivation rec {
     substituteInPlace resources/src/index.html \
       --replace-fail 'catalyst-default-distrib' 'catalyst-default-nixpkgs'
 
-    substituteInPlace $out/share/applications/${pname}.desktop \
+    substituteInPlace $out/share/applications/catalyst.desktop \
       --replace-fail 'Exec=AppRun' 'Exec=${meta.mainProgram}'
 
-    asar pack resources/ $out/share/${pname}/resources/app.asar
+    asar pack resources/ $out/share/catalyst/resources/app.asar
 
     runHook postInstall
   '';
 
   postFixup = ''
     makeWrapper ${electron}/bin/electron $out/bin/${meta.mainProgram} \
-      --add-flags $out/share/${pname}/resources/app.asar \
+      --add-flags $out/share/catalyst/resources/app.asar \
       --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
   '';