diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-05-30 10:11:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-30 10:11:53 +0300 |
| commit | 03bec0f29d918ed531522860468cdb5d34256c5b (patch) | |
| tree | 0abbfef6f881b272e43e9bf12a8105bb0b7116ce | |
| parent | 9db2a0900132fb83832dac8323acec8db60e400d (diff) | |
| parent | 57d2ea7636c28fc6180b52f4d551231bf467c7fe (diff) | |
| download | nixpkgs-03bec0f29d918ed531522860468cdb5d34256c5b.tar nixpkgs-03bec0f29d918ed531522860468cdb5d34256c5b.tar.gz nixpkgs-03bec0f29d918ed531522860468cdb5d34256c5b.tar.bz2 nixpkgs-03bec0f29d918ed531522860468cdb5d34256c5b.tar.lz nixpkgs-03bec0f29d918ed531522860468cdb5d34256c5b.tar.xz nixpkgs-03bec0f29d918ed531522860468cdb5d34256c5b.tar.zst nixpkgs-03bec0f29d918ed531522860468cdb5d34256c5b.zip | |
Merge pull request #234927 from wegank/powershell-openssl
powershell: drop openssl_1_1
| -rw-r--r-- | pkgs/shells/powershell/default.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 5dbd8eb4f22..ec0e3673832 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl -, darwin, makeWrapper, less, openssl_1_1, pam, lttng-ust }: +, darwin, makeWrapper, less, openssl, pam, lttng-ust }: let archString = if stdenv.isAarch64 then "arm64" else if stdenv.isx86_64 then "x64" @@ -15,7 +15,7 @@ let archString = if stdenv.isAarch64 then "arm64" platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" else throw "unsupported platform"; - libraries = [ libunwind libuuid icu curl openssl_1_1 ] ++ + libraries = [ libunwind libuuid icu curl openssl ] ++ (if stdenv.isLinux then [ pam lttng-ust ] else [ darwin.Libsystem ]); in stdenv.mkDerivation rec { @@ -42,17 +42,13 @@ stdenv.mkDerivation rec { cp -r * $pslibs - rm -f $pslibs/libcrypto${ext}.1.0.0 - rm -f $pslibs/libssl${ext}.1.0.0 - # At least the 7.1.4-osx package does not have the executable bit set. chmod a+x $pslibs/pwsh - ls $pslibs - '' + lib.optionalString (!stdenv.isDarwin && !stdenv.isAarch64) '' - patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext}.1.1 $pslibs/libmi.so - patchelf --replace-needed libssl${ext}.1.0.0 libssl${ext}.1.1 $pslibs/libmi.so - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.isLinux && stdenv.isx86_64) '' + patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext} $pslibs/libmi.so + patchelf --replace-needed libssl${ext}.1.0.0 libssl${ext} $pslibs/libmi.so + '' + lib.optionalString stdenv.isLinux '' patchelf --replace-needed liblttng-ust${ext}.0 liblttng-ust${ext}.1 $pslibs/libcoreclrtraceptprovider.so '' + '' |