cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

spotify: use default libgcrypt / libpng

Browse source 
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 165cb05ea5 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`.
This commit is contained in:
Rebecca Turner 2021-01-29 18:44:12 -05:00 committed by erictapen
parent 19ac92915a
commit a61c57ae5c
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/top-level/all-packages.nix
View file

@ -24818,8 +24818,6 @@ in
}; };
spotify-unwrapped = callPackage ../applications/audio/spotify { spotify-unwrapped = callPackage ../applications/audio/spotify {
libgcrypt = libgcrypt_1_5;
libpng = libpng12;
curl = curl.override { curl = curl.override {
sslSupport = false; gnutlsSupport = true; sslSupport = false; gnutlsSupport = true;
}; };