electron: add libstdc++ to RPATH
This commit is contained in:
parent
5df2409d85
commit
945d8147f7
|
@ -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; {
|
||||||
|
|
|
@ -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 { };
|
||||||
|
|
|
@ -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; {
|
||||||
|
|
|
@ -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 + ''
|
||||||
|
|
Loading…
Reference in New Issue
Block a user