diff options
author | Austin Butler <austinabutler@gmail.com> | 2023-02-27 11:54:16 -0800 |
---|---|---|
committer | Austin Butler <austinabutler@gmail.com> | 2023-02-27 11:54:16 -0800 |
commit | 645253e62fdcabe9247f38d8033bf086f86b0715 (patch) | |
tree | 65b062dd2a3aeba31a4bc71eb647209f9f3246de /pkgs/applications/networking/browsers/firefox/wrapper.nix | |
parent | 6e7cfee29787dc7c1cca10b2f15deb61756939c7 (diff) | |
download | nixpkgs-645253e62fdcabe9247f38d8033bf086f86b0715.tar nixpkgs-645253e62fdcabe9247f38d8033bf086f86b0715.tar.gz nixpkgs-645253e62fdcabe9247f38d8033bf086f86b0715.tar.bz2 nixpkgs-645253e62fdcabe9247f38d8033bf086f86b0715.tar.lz nixpkgs-645253e62fdcabe9247f38d8033bf086f86b0715.tar.xz nixpkgs-645253e62fdcabe9247f38d8033bf086f86b0715.tar.zst nixpkgs-645253e62fdcabe9247f38d8033bf086f86b0715.zip |
firefox: fix desktop file and icon for variants
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/wrapper.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index de68807d8f2..6b89e4cd700 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -31,7 +31,7 @@ let (lib.toUpper (lib.substring 0 1 applicationName) + lib.substring 1 (-1) applicationName) , nameSuffix ? "" , icon ? applicationName - , wmClass ? null + , wmClass ? applicationName , extraNativeMessagingHosts ? [] , pkcs11Modules ? [] , useGlvnd ? true @@ -61,7 +61,7 @@ let smartcardSupport = cfg.smartcardSupport or false; nativeMessagingHosts = - ([ ] + [ ] ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) ++ lib.optional (cfg.enableBukubrow or false) bukubrow ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native @@ -70,7 +70,7 @@ let ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts - ); + ; libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] ++ lib.optional pipewireSupport pipewire ++ lib.optional ffmpegSupport ffmpeg_5 @@ -168,10 +168,10 @@ let inherit pname version; desktopItem = makeDesktopItem ({ - name = applicationName; - exec = "${launcherName} %U"; + name = launcherName; + exec = "${launcherName} --name ${wmClass} %U"; inherit icon; - desktopName = "${desktopName}${nameSuffix}"; + inherit desktopName; startupNotify = true; startupWMClass = wmClass; terminal = false; @@ -403,7 +403,7 @@ let disallowedRequisites = [ stdenv.cc ]; meta = browser.meta // { - description = browser.meta.description; + inherit (browser.meta) description; hydraPlatforms = []; priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package }; |