diff options
| author | Robin Gloster <mail@glob.in> | 2019-07-30 03:41:32 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-07-30 03:41:32 +0200 |
| commit | 242e52dbb10db220aaa1d157720914864bbf685f (patch) | |
| tree | 7dafc4a947f0760d6083906a9212d1786adf98a5 /pkgs/applications/altcoins | |
| parent | fafcf50a5679dede3101808a82f07ed0bedb0074 (diff) | |
| download | nixpkgs-242e52dbb10db220aaa1d157720914864bbf685f.tar nixpkgs-242e52dbb10db220aaa1d157720914864bbf685f.tar.gz nixpkgs-242e52dbb10db220aaa1d157720914864bbf685f.tar.bz2 nixpkgs-242e52dbb10db220aaa1d157720914864bbf685f.tar.lz nixpkgs-242e52dbb10db220aaa1d157720914864bbf685f.tar.xz nixpkgs-242e52dbb10db220aaa1d157720914864bbf685f.tar.zst nixpkgs-242e52dbb10db220aaa1d157720914864bbf685f.zip | |
treewide: remove openssl 1.1 pinning
Diffstat (limited to 'pkgs/applications/altcoins')
| -rw-r--r-- | pkgs/applications/altcoins/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/altcoins/wasabiwallet/default.nix | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 5293c1eefa3..5d89bd96ed9 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, boost155, boost165, openssl_1_1, darwin, libsForQt5, libsForQt59, miniupnpc_2, python3, buildGo110Package }: +{ callPackage, boost155, boost165, darwin, libsForQt5, libsForQt59, miniupnpc_2, python3, buildGo110Package }: rec { @@ -90,7 +90,6 @@ rec { zcash = callPackage ./zcash { withGui = false; - openssl = openssl_1_1; }; parity = callPackage ./parity { }; diff --git a/pkgs/applications/altcoins/wasabiwallet/default.nix b/pkgs/applications/altcoins/wasabiwallet/default.nix index 9eef471adad..7185b351060 100644 --- a/pkgs/applications/altcoins/wasabiwallet/default.nix +++ b/pkgs/applications/altcoins/wasabiwallet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, openssl_1_1, xorg, curl, fontconfig, krb5, zlib, dotnet-sdk }: +{ stdenv, fetchurl, makeDesktopItem, openssl, xorg, curl, fontconfig, krb5, zlib, dotnet-sdk }: stdenv.mkDerivation rec { pname = "wasabiwallet"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cd $out/opt/${pname} for i in $(find . -type f -name '*.so') wassabee do - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl_1_1 stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i done patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee ln -s $out/opt/${pname}/wassabee $out/bin/${pname} |