From 6a0cf40cf4f06538bee3d040f2101348e1f8526f Mon Sep 17 00:00:00 2001 From: Maximilian Marx Date: Tue, 16 Apr 2024 14:54:29 +0200 Subject: [PATCH] electron: add libsecret to RPATH --- .../applications/editors/standardnotes/default.nix | 14 ++++++++++---- pkgs/development/tools/electron/common.nix | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 8d535f6f5534..e61f57c76448 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, fetchurl, dpkg, makeWrapper, electron, libsecret -, desktop-file-utils , callPackage }: +{ lib +, stdenv +, fetchurl +, dpkg +, makeWrapper +, electron +, desktop-file-utils +, callPackage +}: let @@ -33,8 +40,7 @@ stdenv.mkDerivation rec { cp -R opt/Standard\ Notes/resources/app.asar $out/share/standardnotes/ makeWrapper ${electron}/bin/electron $out/bin/standardnotes \ - --add-flags $out/share/standardnotes/app.asar \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret stdenv.cc.cc.lib ]} + --add-flags $out/share/standardnotes/app.asar ${desktop-file-utils}/bin/desktop-file-install --dir $out/share/applications \ --set-key Exec --set-value standardnotes usr/share/applications/standard-notes.desktop diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 04e2d88cc239..fc22e49e285f 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -14,6 +14,7 @@ , pkgs , pkgsBuildHost , pipewire +, libsecret , info }: @@ -196,6 +197,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { libnotify pipewire stdenv.cc.cc.lib + libsecret ]; in base.postFixup + ''