electron: add libstdc++ to RPATH

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

View File

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

View File

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

View File

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

View File

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