swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8157 from monocell/spotify-fix

Browse source 
fix spotify by using older libgcrypt
This commit is contained in:
lethalman 2015-06-04 10:05:43 +02:00
parent a714ddcbd5 165cb05ea5
commit 8e564526fc
2 changed files with 53 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
pkgs/development/libraries/libgcrypt/1.5.nix Normal file
View file

@ -0,0 +1,50 @@
{ stdenv, fetchurl
, libgpgerror
# Optional Dependencies
, libcap ? null
}:
let
mkFlag = trueStr: falseStr: cond: name: val:
if cond == null then null else
"--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
mkWith = mkFlag "with-" "without-";
shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
optLibcap = shouldUsePkg libcap;
in
stdenv.mkDerivation rec {
name = "libgcrypt-1.5.4";
src = fetchurl {
url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
sha256 = "0czvqxkzd5y872ipy6s010ifwdwv29sqbnqc4pf56sd486gqvy6m";
};
buildInputs = [ libgpgerror optLibcap ];
configureFlags = [
(mkWith (optLibcap != null) "capabilities" null)
];
# Make sure libraries are correct for .pc and .la files
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
postInstall = ''
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h
'' + stdenv.lib.optionalString (!stdenv.isDarwin && optLibcap != null) ''
sed -i 's,\(-lcap\),-L${optLibcap}/lib \1,' $out/lib/libgcrypt.la
'';
doCheck = true;
meta = with stdenv.lib; {
homepage = https://www.gnu.org/software/libgcrypt/;
description = "General-pupose cryptographic library";
license = licenses.lgpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ wkennington ];
repositories.git = git://git.gnupg.org/libgcrypt.git;
};
}

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

@ -6787,6 +6787,8 @@ let
libcap = null;
};
libgcrypt_1_5 = lowPrio (callPackage ../development/libraries/libgcrypt/1.5.nix { });
libgdiplus = callPackage ../development/libraries/libgdiplus { };
libgksu = callPackage ../development/libraries/libgksu { };
@ -12417,6 +12419,7 @@ let
spotify = callPackage ../applications/audio/spotify {
inherit (gnome) GConf;
libgcrypt = libgcrypt_1_5;
libpng = libpng12;
};