colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnutls33: remove

Browse Source
This commit is contained in:
Robin Gloster 2017-01-27 18:37:24 +01:00
parent a611ecad17
commit aa686fe5c3
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
3 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/audio/freewheeling/default.nix
View File

@ -1,22 +1,26 @@
{ stdenv, fetchsvn, pkgconfig, autoreconfHook, gnutls33, freetype
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, gnutls, freetype
, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis
, libSM, libsndfile, libogg
}:
stdenv.mkDerivation rec {
name = "freewheeling-${version}";
version = "100";
version = "2016-11-15";
src = fetchsvn {
url = svn://svn.code.sf.net/p/freewheeling/code;
rev = version;
sha256 = "1m6z7p93xyha25qma9bazpzbp04pqdv5h3yrv6851775xsyvzksv";
src = fetchFromGitHub {
owner = "free-wheeling";
repo = "freewheeling";
rev = "05ef3bf150fa6ba1b1d437b1fd70ef363289742f";
sha256 = "19plf7r0sq4271ln5bya95mp4i1j30x8hsxxga2kla27z953n9ih";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [
gnutls33 freetype SDL SDL_gfx SDL_ttf
freetype SDL SDL_gfx SDL_ttf
liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM
(gnutls.overrideAttrs (oldAttrs: {
configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ];
}))
];
patches = [ ./am_path_sdl.patch ./xml.patch ];

10
pkgs/development/libraries/gnutls/3.3.nix
View File

@ -1,10 +0,0 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.3.26";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.xz";
sha256 = "1n90qyz54hhnmf4fmap6zdyv7nihz6mrbqgxhd46h7aqdcmqhzba";
};
})

4
pkgs/top-level/all-packages.nix
View File

@ -7474,10 +7474,6 @@ with pkgs;
gnutls = gnutls34;
gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix {
guileBindings = config.gnutls.guile or false;
};
gnutls34 = callPackage ../development/libraries/gnutls/3.4.nix {
guileBindings = config.gnutls.guile or false;
};