diff options
| author | Maximilian Marx <mmarx@wh2.tu-dresden.de> | 2024-04-16 14:37:15 +0200 |
|---|---|---|
| committer | Maximilian Marx <mmarx@wh2.tu-dresden.de> | 2024-04-16 15:15:44 +0200 |
| commit | 945d8147f7556aeadcbca53bfe2f60f7ae1ec226 (patch) | |
| tree | 87ea3ec0f9db59c3f4c5904463eb1baf70257461 /pkgs | |
| parent | 5df2409d852e2367dc2c209f1ef11bb7ae812041 (diff) | |
electron: add libstdc++ to RPATH
Diffstat (limited to 'pkgs')
4 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/applications/blockchains/terra-station/default.nix b/pkgs/applications/blockchains/terra-station/default.nix index cf684e062c5cb..5c4a7cc8b3549 100644 --- a/pkgs/applications/blockchains/terra-station/default.nix +++ b/pkgs/applications/blockchains/terra-station/default.nix @@ -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; { diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 882481ace1e07..eacd64b06b557 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -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 { }; diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index eb97565cb760d..f1d31b4087b82 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -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; { diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index edecc91a37cb6..04e2d88cc2392 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -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 + '' |