mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-11 04:05:40 +03:00
Revert "treewide: remove duplicated logic for NIXOS_OZONE_WL"
This reverts commit 5f8d564052
.
This commit is contained in:
parent
220db205e6
commit
00c1e4a186
63 changed files with 80 additions and 14 deletions
|
@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/youtube-music \
|
||||
--add-flags $out/share/lib/youtube-music/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set-default ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
|
|
@ -278,6 +278,7 @@ stdenv.mkDerivation (
|
|||
}
|
||||
# Add gio to PATH so that moving files to the trash works when not using a desktop environment
|
||||
--prefix PATH : ${glib.bin}/bin
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
)
|
||||
'';
|
||||
|
|
|
@ -103,6 +103,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/drawio" \
|
||||
--add-flags "$out/share/lib/drawio/resources/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
''
|
||||
+ ''
|
||||
|
|
|
@ -96,7 +96,8 @@ stdenv.mkDerivation rec {
|
|||
"$out/share/icons/hicolor/64x64/apps/whalebird.png"
|
||||
|
||||
makeWrapper "${electron}/bin/electron" "$out/bin/whalebird" \
|
||||
--add-flags "$out/opt/Whalebird/resources/app.asar"
|
||||
--add-flags "$out/opt/Whalebird/resources/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
@ -62,7 +62,8 @@ let
|
|||
mkdir -p $out/libexec/geogebra/ $out/bin
|
||||
cp -r GeoGebra-linux-x64/{resources,locales} "$out/"
|
||||
makeWrapper ${lib.getBin electron}/bin/electron $out/bin/geogebra \
|
||||
--add-flags "$out/resources/app"
|
||||
--add-flags "$out/resources/app" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
install -Dm644 "${desktopItem}/share/applications/"* \
|
||||
-t $out/share/applications/
|
||||
|
||||
|
|
|
@ -115,6 +115,7 @@ stdenvNoCC.mkDerivation (
|
|||
makeWrapper "${electron}/bin/electron" $out/bin/${binName} \
|
||||
--inherit-argv0 \
|
||||
--add-flags $out/lib/${binName}/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
runHook postInstall
|
||||
|
|
|
@ -189,6 +189,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
makeWrapper "${lib.getExe electron}" $out/bin/${binName} \
|
||||
--inherit-argv0 \
|
||||
--add-flags $out/lib/${binName}/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
runHook postInstall
|
||||
|
|
|
@ -89,6 +89,7 @@ buildNpmPackage {
|
|||
|
||||
makeWrapper '${lib.getExe electron}' $out/bin/anytype \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags $out/lib/node_modules/anytype/ \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
|
|
|
@ -53,6 +53,7 @@ buildNpmPackage {
|
|||
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/appium-inspector" \
|
||||
--add-flags "$out/share/appium-inspector/resources/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set NODE_ENV production
|
||||
|
||||
install -m 444 -D 'app/common/renderer/assets/images/icon.png' \
|
||||
|
|
|
@ -184,6 +184,7 @@ buildNpmPackage' rec {
|
|||
|
||||
makeWrapper '${lib.getExe electron}' "$out/bin/bitwarden" \
|
||||
--add-flags $out/opt/Bitwarden/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
||||
|
|
|
@ -71,6 +71,7 @@ buildNpmPackage rec {
|
|||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/blockbench \
|
||||
--add-flags $out/share/blockbench/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
''}
|
||||
|
||||
|
|
|
@ -153,6 +153,7 @@ buildNpmPackage rec {
|
|||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/bruno \
|
||||
--add-flags $out/opt/bruno/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
||||
|
|
|
@ -67,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
makeWrapper ${lib.getExe electron} $out/bin/bs-manager \
|
||||
--set-default ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--add-flags $out/opt/BSManager/resources \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
|
||||
runHook postInstall
|
||||
|
|
|
@ -49,6 +49,7 @@ buildNpmPackage rec {
|
|||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/caprine \
|
||||
--add-flags $out/share/caprine/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
||||
|
|
|
@ -129,6 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
makeWrapper "${lib.getExe electron}" $out/bin/cherry-studio \
|
||||
--inherit-argv0 \
|
||||
--add-flags $out/lib/cherry-studio/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
runHook postInstall
|
||||
|
|
|
@ -43,6 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
ln -s $out/share/ddm/icon.png $out/share/icons/hicolor/512x512/apps/ddm.png
|
||||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/ddm \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags "$out/share/ddm"
|
||||
|
||||
# Install externally-downloaded campaign packs & cube lists
|
||||
|
|
|
@ -110,6 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/${finalAttrs.meta.mainProgram} \
|
||||
--add-flags $out/opt/DeltaChat/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
|
||||
runHook postInstall
|
||||
|
|
|
@ -102,6 +102,7 @@ stdenv.mkDerivation (
|
|||
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
||||
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
|
||||
--add-flags "$out/share/element/electron" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
runHook postInstall
|
||||
|
|
|
@ -109,7 +109,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
makeWrapper '${electron}/bin/electron' "$out/bin/ente-desktop" \
|
||||
--set ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--set ELECTRON_IS_DEV 0 \
|
||||
--add-flags "$out/share/ente-desktop/resources/app.asar"
|
||||
--add-flags "$out/share/ente-desktop/resources/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
@ -110,7 +110,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
makeWrapper ${electron}/bin/electron $out/bin/equibop \
|
||||
--add-flags $out/opt/Equibop/resources/app.asar \
|
||||
${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \
|
||||
${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""}
|
||||
${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
'';
|
||||
|
||||
desktopItems = makeDesktopItem {
|
||||
|
|
|
@ -115,6 +115,7 @@ buildNpmPackage {
|
|||
# https://github.com/electron/electron/issues/35153#issuecomment-1202718531
|
||||
makeWrapper ${lib.getExe electron} $out/bin/feishin \
|
||||
--add-flags $out/share/feishin/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set ELECTRON_FORCE_IS_PACKAGED=1 \
|
||||
--inherit-argv0
|
||||
|
||||
|
|
|
@ -91,7 +91,8 @@ stdenv.mkDerivation rec {
|
|||
makeWrapper "${electron}/bin/electron" "$out/bin/follow" \
|
||||
--inherit-argv0 \
|
||||
--add-flags --disable-gpu-compositing \
|
||||
--add-flags $out/share/follow
|
||||
--add-flags $out/share/follow \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
|
||||
install -m 444 -D "${desktopItem}/share/applications/"* \
|
||||
-t $out/share/applications/
|
||||
|
|
|
@ -69,7 +69,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
cp -r build/*-unpacked/{locales,resources{,.pak}} -t $out/share/freetube
|
||||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/freetube \
|
||||
--add-flags "$out/share/freetube/resources/app.asar"
|
||||
--add-flags "$out/share/freetube/resources/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
|
||||
install -D _icons/icon.svg $out/share/icons/hicolor/scalable/apps/freetube.svg
|
||||
''
|
||||
|
|
|
@ -98,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
--set LD_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib:${libPath} \
|
||||
--suffix PATH : "${binPath}" \
|
||||
--set ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--add-flags $out/share/gdlauncher-carbon/resources/app.asar
|
||||
'';
|
||||
|
||||
|
|
|
@ -59,7 +59,8 @@ buildNpmPackage {
|
|||
|
||||
postFixup = ''
|
||||
makeWrapper $out/dist/geforcenow-electron $out/bin/geforcenow-electron \
|
||||
--add-flags "--no-sandbox --disable-gpu-sandbox"
|
||||
--add-flags "--no-sandbox --disable-gpu-sandbox" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
|
||||
substituteInPlace $out/share/applications/com.github.hmlendea.geforcenow-electron.desktop \
|
||||
--replace-fail "/opt/geforcenow-electron/geforcenow-electron" "geforcenow-electron" \
|
||||
|
|
|
@ -80,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/gitify \
|
||||
--add-flags $out/share/gitify/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
''
|
||||
}
|
||||
|
|
|
@ -62,6 +62,7 @@ buildNpmPackage rec {
|
|||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/httptoolkit \
|
||||
--add-flags $out/share/httptoolkit/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
''}
|
||||
|
||||
|
|
|
@ -87,6 +87,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
makeWrapper ${steam-run}/bin/steam-run $out/bin/itch \
|
||||
--add-flags ${electron}/bin/electron \
|
||||
--add-flags $out/share/itch/resources/app \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set BROTH_USE_LOCAL butler,itch-setup \
|
||||
--prefix PATH : ${butler}/bin/:${itch-setup}
|
||||
'';
|
||||
|
|
|
@ -102,6 +102,7 @@ buildNpmPackage rec {
|
|||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/jitsi-meet-electron \
|
||||
--add-flags $out/share/jitsi-meet-electron/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
||||
|
|
|
@ -106,6 +106,7 @@ buildNpmPackage rec {
|
|||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/kando \
|
||||
--add-flags $out/share/kando/resources/app \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
''}
|
||||
|
||||
|
|
|
@ -81,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
makeShellWrapper ${lib.getExe electron} $out/bin/koodo-reader \
|
||||
--add-flags $out/share/lib/koodo-reader/resources/app.asar \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
'';
|
||||
|
|
|
@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
|
|||
# executable wrapper
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/kuro" \
|
||||
--add-flags "$out/share/lib/kuro/resources/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
|
||||
runHook postInstall
|
||||
|
|
|
@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
|
|||
makeShellWrapper "${lib.getExe electron_34}" "$out/bin/legcord" \
|
||||
--add-flags "$out/share/lib/legcord/resources/app.asar" \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
||||
|
|
|
@ -74,6 +74,7 @@ stdenv.mkDerivation {
|
|||
makeWrapper ${electron_32}/bin/electron $out/bin/lx-music-desktop \
|
||||
--add-flags $out/opt/lx-music-desktop/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs} \
|
||||
'';
|
||||
|
||||
|
|
|
@ -149,7 +149,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
cp -r build/*-unpacked/{locales,resources{,.pak}} $out/opt/marktext
|
||||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/marktext \
|
||||
--add-flags $out/opt/marktext/resources/app.asar
|
||||
--add-flags $out/opt/marktext/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
@ -74,7 +74,8 @@ buildNpmPackage rec {
|
|||
|
||||
makeWrapper '${lib.getExe electron}' $out/bin/${pname} \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--add-flags $out/share/${pname}/app.asar
|
||||
--add-flags $out/share/${pname}/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
@ -122,6 +122,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/mqtt-explorer" \
|
||||
--add-flags "$out/share/mqtt-explorer/app/resources/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set-default ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
|
|
@ -69,6 +69,7 @@ buildNpmPackage rec {
|
|||
|
||||
makeWrapper '${lib.getExe electron}' "$out/bin/netron" \
|
||||
--add-flags $out/opt/netron/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
||||
|
|
|
@ -79,6 +79,7 @@ let
|
|||
mkdir -p $out/bin
|
||||
makeWrapper ${electron}/bin/electron $out/bin/obsidian \
|
||||
--add-flags $out/share/obsidian/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime=true}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
install -m 444 -D resources/app.asar $out/share/obsidian/app.asar
|
||||
install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar
|
||||
|
|
|
@ -76,6 +76,7 @@ buildNpmPackage rec {
|
|||
|
||||
makeWrapper '${lib.getExe electron}' "$out/bin/penpot-desktop" \
|
||||
--add-flags $out/opt/Penpot/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
||||
|
|
|
@ -83,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/podman-desktop" \
|
||||
--add-flags "$out/share/lib/podman-desktop/resources/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
'' + ''
|
||||
|
||||
|
|
|
@ -46,6 +46,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
preFixup = ''
|
||||
makeWrapper ${lib.getExe electron} $out/bin/proton-pass \
|
||||
--add-flags $out/share/proton-pass/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set-default ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
|
|
@ -53,6 +53,7 @@ stdenv.mkDerivation {
|
|||
preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
makeWrapper ${lib.getExe electron} $out/bin/${mainProgram} \
|
||||
--add-flags $out/share/proton-mail/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set-default ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
|
|
@ -86,7 +86,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
makeWrapper '${lib.getExe electron}' "$out/bin/r2modman" \
|
||||
--inherit-argv0 \
|
||||
--add-flags "$out/share/r2modman"
|
||||
--add-flags "$out/share/r2modman" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
@ -138,6 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/redisinsight" \
|
||||
--add-flags "$out/share/redisinsight/app/resources/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set-default ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--inherit-argv0
|
||||
|
||||
|
|
|
@ -73,7 +73,8 @@
|
|||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/revolt-desktop \
|
||||
--add-flags $out/share/revolt-desktop/resources/app.asar
|
||||
--add-flags $out/share/revolt-desktop/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
'';
|
||||
}
|
||||
else
|
||||
|
|
|
@ -108,6 +108,7 @@ buildNpmPackage rec {
|
|||
cp -r locales resources{,.pak} $out/share/ride
|
||||
makeShellWrapper ${lib.getExe electron} $out/bin/ride \
|
||||
--add-flags $out/share/ride/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
''}
|
||||
|
||||
|
|
|
@ -129,6 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
--chdir $out/share/siyuan/resources \
|
||||
--add-flags $out/share/siyuan/resources/app \
|
||||
--set ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
|
||||
install -Dm644 src/assets/icon.svg $out/share/icons/hicolor/scalable/apps/siyuan.svg
|
||||
|
|
|
@ -91,6 +91,7 @@ buildNpmPackage rec {
|
|||
|
||||
makeWrapper '${lib.getExe electron}' "$out/bin/super-productivity" \
|
||||
--add-flags "$out/share/super-productivity/app/resources/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--set-default ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--inherit-argv0
|
||||
''
|
||||
|
|
|
@ -79,7 +79,8 @@ buildNpmPackage rec {
|
|||
which
|
||||
]
|
||||
} \
|
||||
--add-flags "$out/share/teams-for-linux/app.asar"
|
||||
--add-flags "$out/share/teams-for-linux/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
|
|
|
@ -46,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
postFixup = ''
|
||||
makeShellWrapper '${lib.getExe electron}' $out/bin/tetrio \
|
||||
--prefix LD_LIBRARY_PATH : ${addDriverRunpath.driverLink}/lib \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags $out/share/TETR.IO/app.asar
|
||||
'';
|
||||
|
||||
|
|
|
@ -106,6 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
postFixup = ''
|
||||
makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
substituteInPlace $out/share/applications/tidal-hifi.desktop \
|
||||
--replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi"
|
||||
|
|
|
@ -61,6 +61,7 @@ stdenvNoCC.mkDerivation {
|
|||
|
||||
makeWrapper "${electron}/bin/electron" "$out/bin/${pname}" \
|
||||
--add-flags "$out/opt/${pname}/app.asar.unpacked" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
||||
|
|
|
@ -140,7 +140,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
makeWrapper ${electron}/bin/electron $out/bin/vesktop \
|
||||
--add-flags $out/opt/Vesktop/resources/app.asar \
|
||||
${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \
|
||||
${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""}
|
||||
${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
makeWrapper $out/Applications/Vesktop.app/Contents/MacOS/Vesktop $out/bin/vesktop
|
||||
|
|
|
@ -97,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/voicevox \
|
||||
--add-flags $out/share/voicevox/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--inherit-argv0
|
||||
''}
|
||||
|
||||
|
|
|
@ -57,6 +57,7 @@ buildNpmPackage rec {
|
|||
# Add xdg-utils to path via suffix, per PR #181171
|
||||
makeWrapper '${lib.getExe electron}' $out/bin/webcord \
|
||||
--suffix PATH : "${binPath}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags $out/lib/node_modules/webcord/
|
||||
|
||||
runHook postInstall
|
||||
|
|
|
@ -140,6 +140,10 @@ let
|
|||
libdbusmenu
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}")
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper $out/opt/Wire/wire-desktop $out/bin/wire-desktop \
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
|
|
|
@ -82,6 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
makeWrapper ${lib.getExe electron_33} $out/bin/ytmdesktop \
|
||||
--add-flags $out/lib/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
runHook preFixup
|
||||
|
|
|
@ -76,6 +76,7 @@ buildNpmPackage rec {
|
|||
rm $out/bin/zap
|
||||
makeWrapper '${lib.getExe electron}' "$out/bin/zap" \
|
||||
--add-flags $out/opt/zap-chip/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
'';
|
||||
|
|
|
@ -133,6 +133,7 @@ stdenv.mkDerivation {
|
|||
makeWrapper ${lib.getExe electron} $out/bin/simulator \
|
||||
--add-flags "--no-sandbox" \
|
||||
--add-flags $out/opt/simulator/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--set-default NODE_ENV production \
|
||||
--set-default ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
|
|
|
@ -50,6 +50,7 @@ buildNpmPackage rec {
|
|||
|
||||
makeShellWrapper '${lib.getExe electron_32}' "$out/bin/zulip" \
|
||||
--add-flags "$out/share/lib/zulip/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
|
||||
runHook postInstall
|
||||
|
|
|
@ -89,7 +89,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
--inherit-argv0 \
|
||||
--set ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--add-flags --disable-gpu-compositing \
|
||||
--add-flags $out/opt/heroic/resources/app.asar
|
||||
--add-flags $out/opt/heroic/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
|
||||
install -D "flatpak/com.heroicgameslauncher.hgl.desktop" "$out/share/applications/com.heroicgameslauncher.hgl.desktop"
|
||||
install -D "src/frontend/assets/heroic-icon.svg" "$out/share/icons/hicolor/scalable/apps/com.heroicgameslauncher.hgl.svg"
|
||||
|
|
|
@ -85,6 +85,7 @@ in
|
|||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/bitwarden-directory-connector \
|
||||
--add-flags $out/share/bitwarden-directory-connector/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue