Skip to content

Commit fc8690c

Browse files
committed
feat(package): linux desktop icon for beta should be "zen-browser"
Closes #123.
1 parent 1172863 commit fc8690c

1 file changed

Lines changed: 12 additions & 7 deletions

File tree

package.nix

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@
5555

5656
pname = "zen-${name}-bin-unwrapped";
5757

58+
desktopIconName =
59+
if name == "beta"
60+
then "zen-browser"
61+
else binaryName;
62+
5863
installDarwin = ''
5964
runHook preInstall
6065
@@ -87,11 +92,11 @@
8792
mkdir -p "$out/lib/${libName}/distribution"
8893
ln -s ${policiesJson} "$out/lib/${libName}/distribution/policies.json"
8994
90-
install -D $src/browser/chrome/icons/default/default16.png $out/share/icons/hicolor/16x16/apps/zen-${name}.png
91-
install -D $src/browser/chrome/icons/default/default32.png $out/share/icons/hicolor/32x32/apps/zen-${name}.png
92-
install -D $src/browser/chrome/icons/default/default48.png $out/share/icons/hicolor/48x48/apps/zen-${name}.png
93-
install -D $src/browser/chrome/icons/default/default64.png $out/share/icons/hicolor/64x64/apps/zen-${name}.png
94-
install -D $src/browser/chrome/icons/default/default128.png $out/share/icons/hicolor/128x128/apps/zen-${name}.png
95+
install -D $src/browser/chrome/icons/default/default16.png $out/share/icons/hicolor/16x16/apps/${desktopIconName}.png
96+
install -D $src/browser/chrome/icons/default/default32.png $out/share/icons/hicolor/32x32/apps/${desktopIconName}.png
97+
install -D $src/browser/chrome/icons/default/default48.png $out/share/icons/hicolor/48x48/apps/${desktopIconName}.png
98+
install -D $src/browser/chrome/icons/default/default64.png $out/share/icons/hicolor/64x64/apps/${desktopIconName}.png
99+
install -D $src/browser/chrome/icons/default/default128.png $out/share/icons/hicolor/128x128/apps/${desktopIconName}.png
95100
96101
runHook postInstall
97102
'';
@@ -120,7 +125,7 @@ in
120125
name = binaryName;
121126
desktopName = "Zen Browser${lib.optionalString (name == "twilight") " Twilight"}";
122127
exec = "${binaryName} %u";
123-
icon = binaryName;
128+
icon = desktopIconName;
124129
type = "Application";
125130
mimeTypes = [
126131
"text/html"
@@ -193,7 +198,7 @@ in
193198

194199
preFixup = ''
195200
gappsWrapperArgs+=(
196-
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ ffmpeg ]}"
201+
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ffmpeg]}"
197202
--add-flags "--name=''${MOZ_APP_LAUNCHER:-${binaryName}}"
198203
--add-flags "--class=''${MOZ_APP_LAUNCHER:-${binaryName}}"
199204
)

0 commit comments

Comments
 (0)