diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2022-04-02 12:59:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-02 12:59:55 +0000 |
| commit | 8188f10752f93f71ac5a0e14ce2748340fa63273 (patch) | |
| tree | 3bd6c3fc121eef9d211bc74cd293a8920124cccf /pkgs/applications/editors | |
| parent | 1b4459e127cb7815ae982f8f3770adf05f65a6ba (diff) | |
| parent | fd78240ac82ada2b598d4491dbf6ff8622bd3dff (diff) | |
| download | nixlib-8188f10752f93f71ac5a0e14ce2748340fa63273.tar nixlib-8188f10752f93f71ac5a0e14ce2748340fa63273.tar.gz nixlib-8188f10752f93f71ac5a0e14ce2748340fa63273.tar.bz2 nixlib-8188f10752f93f71ac5a0e14ce2748340fa63273.tar.lz nixlib-8188f10752f93f71ac5a0e14ce2748340fa63273.tar.xz nixlib-8188f10752f93f71ac5a0e14ce2748340fa63273.tar.zst nixlib-8188f10752f93f71ac5a0e14ce2748340fa63273.zip | |
Merge pull request #166430 from alyssais/openssl-static-retry
treewide: use lib.getLib for OpenSSL libraries
Diffstat (limited to 'pkgs/applications/editors')
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index e975678591c7..2620a87ce425 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -57,7 +57,7 @@ in $out/kodestudio patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsa-lib}/lib:${libGL}/lib:${libGLU}/lib:${openssl.out}/lib" \ + --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsa-lib}/lib:${libGL}/lib:${libGLU}/lib:${lib.getLib openssl}/lib" \ $out/resources/app/extensions/krom/Krom/linux/Krom patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index b4bfc6c9ea73..a5cf2d560c01 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -101,7 +101,7 @@ in let "''${gappsWrapperArgs[@]}" # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${lib.getLib openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so ''; }; in stdenv.mkDerivation (rec { diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix index d91cbccb8083..b1a3917417d9 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix @@ -107,7 +107,7 @@ vscode-utils.buildVscodeMarketplaceExtension { patchelf_add_icu_as_needed "$elf" patchelf --add-needed "libssl.so" "$elf" patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc openssl.out icu.out ]}:\$ORIGIN" \ + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc openssl icu.out ]}:\$ORIGIN" \ "$elf" } |