diff options
| author | Samuel Leathers <sam@appliedtrust.com> | 2017-09-01 17:21:42 -0400 |
|---|---|---|
| committer | Samuel Leathers <sam@appliedtrust.com> | 2017-09-01 17:21:42 -0400 |
| commit | 232c6a00ce415b6ca7e07dd7d71335ae41ed4450 (patch) | |
| tree | 712e12ba8fb886a4d8f7b52fd0438828136133a0 /pkgs/applications/audio/freewheeling | |
| parent | b2e7e231ec3ec67545aa9ace003973543dedb801 (diff) | |
| download | nixpkgs-232c6a00ce415b6ca7e07dd7d71335ae41ed4450.tar nixpkgs-232c6a00ce415b6ca7e07dd7d71335ae41ed4450.tar.gz nixpkgs-232c6a00ce415b6ca7e07dd7d71335ae41ed4450.tar.bz2 nixpkgs-232c6a00ce415b6ca7e07dd7d71335ae41ed4450.tar.lz nixpkgs-232c6a00ce415b6ca7e07dd7d71335ae41ed4450.tar.xz nixpkgs-232c6a00ce415b6ca7e07dd7d71335ae41ed4450.tar.zst nixpkgs-232c6a00ce415b6ca7e07dd7d71335ae41ed4450.zip | |
freewheeling: UNSTABLE -> 0.6.2
Diffstat (limited to 'pkgs/applications/audio/freewheeling')
| -rw-r--r-- | pkgs/applications/audio/freewheeling/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index f37b44f9231..25704d26280 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, gnutls, freetype +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, gnutls, freetype , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis -, libSM, libsndfile, libogg +, libSM, libsndfile, libogg, libtool }: +let + makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL"); +in stdenv.mkDerivation rec { name = "freewheeling-${version}"; - version = "2016-11-15"; + version = "0.6.2"; src = fetchFromGitHub { owner = "free-wheeling"; repo = "freewheeling"; - rev = "05ef3bf150fa6ba1b1d437b1fd70ef363289742f"; - sha256 = "19plf7r0sq4271ln5bya95mp4i1j30x8hsxxga2kla27z953n9ih"; + rev = "v${version}"; + sha256 = "01hmp0jxzxpb5sl0x91hdlwmbw9n4yffrpra4f89s4n8cixrz3d9"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkgconfig autoreconfHook libtool ]; buildInputs = [ freetype SDL SDL_gfx SDL_ttf liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM @@ -22,8 +25,7 @@ stdenv.mkDerivation rec { configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ]; })) ]; - - patches = [ ./am_path_sdl.patch ./xml.patch ]; + NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_ttf SDL_gfx ] ++ [ "-I${libxml2.dev}/include/libxml2" ]; hardeningDisable = [ "format" ]; |