dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

{element-desktop,schildichat}-wayland: use writeScriptBin instead of writeScript

Browse Source 
This resolves issues with buildEnv (and probably other tools too),
putting the resulting files into $out/bin.  Fixes #157507.

We also change the script names back to the ones without the -wayland
suffix, since the old `useWayland` feature flag didn't add it either,
which may have broken downstream configs.
This commit is contained in:
Josh Holland 2022-01-31 12:57:36 +00:00
parent 419a7068ed
commit b4176d50cf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/all-packages.nix
View File

@ -2969,7 +2969,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
electron = electron_13;
};
element-desktop-wayland = writeScript "element-desktop-wayland" ''
element-desktop-wayland = writeScriptBin "element-desktop" ''
#!/bin/sh
NIXOS_OZONE_WL=1 exec ${element-desktop}/bin/element-desktop "$@"
'';
@ -4976,7 +4976,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
electron = electron_13;
};
schildichat-desktop-wayland = writeScript "schildichat-desktop-wayland" ''
schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" ''
#!/bin/sh
NIXOS_OZONE_WL=1 exec ${schildichat-desktop}/bin/schildichat-desktop "$@"
'';