summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorRebecca Turner <rbt@sent.as>2021-01-29 18:44:12 -0500
committererictapen <justin.humm@posteo.de>2021-01-30 01:15:58 +0100
commita61c57ae5c9394f9e63913943da547279c23cb2e (patch)
tree25cf98f9dd5f0deb3975a1143cbe7ab76587c4b5 /pkgs
parent19ac92915a78719a1776923c33c9ab3498c38d11 (diff)
spotify: use default libgcrypt / libpng
Instead of overriding `libgcrypt` with the (insecure) `libgcrypt_1_5` and `libpng` with `libpng12`, use the defaults for those two packages. Built and checked on my NixOS desktop machine because @dotlambda said he wouldn't check proprietary software in #111215. `spotify` was changed to use `libgcrypt_1_5` instead of `libgcrypt` in commit 165cb05ea5f42866a5b38521a8266f10045d48b2 by @monocell in PR #8157 to address #8156, which found that: > the current spotify client seems to depend on `libgcrypt.so.11`. > Pretending with libgcrypt.so.20 produces an error like: > ... libgcrypt.so.11: version `GCRYPT_1.2' not found ... Given that the relevant Spotify client is more than 5 years old, I don't think we have to worry about this any more. :) This commit helps #106203, but doesn't close it because `libgcrypt_1_5` is still used in `staruml`.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix2
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f823ee0f8be6..bec49463f9d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24818,8 +24818,6 @@ in
};
spotify-unwrapped = callPackage ../applications/audio/spotify {
- libgcrypt = libgcrypt_1_5;
- libpng = libpng12;
curl = curl.override {
sslSupport = false; gnutlsSupport = true;
};