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

electron: add libstdc++ to RPATH

Browse Source
This commit is contained in:
Maximilian Marx 2024-04-16 14:37:15 +02:00
parent 5df2409d85
commit 945d8147f7
No known key found for this signature in database
GPG Key ID: D981CA0FF602751D
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/blockchains/terra-station/default.nix
View File

@ -1,6 +1,5 @@
{ lib, stdenv
, fetchurl
, gcc-unwrapped
, dpkg
, util-linux
, bash
@ -57,8 +56,7 @@ stdenv.mkDerivation rec {
postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app.asar \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}"
--add-flags $out/share/${pname}/resources/app.aasar
'';
meta = with lib; {

3
pkgs/applications/misc/logseq/default.nix
View File

@ -60,8 +60,7 @@ in {
makeWrapper ${electron_27}/bin/electron $out/bin/${pname} \
--set "LOCAL_GIT_DIRECTORY" ${git} \
--add-flags $out/share/${pname}/resources/app \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}"
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
'';
passthru.updateScript = nix-update-script { };

3
pkgs/applications/office/super-productivity/default.nix
View File

@ -38,8 +38,7 @@ stdenv.mkDerivation rec {
postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app.asar \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
--add-flags $out/share/${pname}/resources/app.asar
'';
meta = with lib; {

1
pkgs/development/tools/electron/common.nix
View File

@ -195,6 +195,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
libPath = lib.makeLibraryPath [
libnotify
pipewire
stdenv.cc.cc.lib
];
in
base.postFixup + ''