Unverified Commit 945d8147 authored by Maximilian Marx's avatar Maximilian Marx
Browse files

electron: add libstdc++ to RPATH

parent 5df2409d

pkgs/applications/blockchains/terra-station/default.nix

+1 −3
Original line number Diff line number Diff line 
{ 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; {

pkgs/applications/misc/logseq/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -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 { };

pkgs/applications/office/super-productivity/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -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; {

pkgs/development/tools/electron/common.nix

+1 −0
Original line number Diff line number Diff line
@@ -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 + ''