diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-09-02 08:28:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-02 08:28:14 +0100 |
commit | 34f1024a83aea66fac6f7bdae72ae09f45534ae8 (patch) | |
tree | 17acb6cfd144743b61e7873a624d2e5f8c25813b /pkgs/applications | |
parent | 7b20952c04cc1881477252525e0b21b15f45a42a (diff) | |
parent | 232c6a00ce415b6ca7e07dd7d71335ae41ed4450 (diff) | |
download | nixlib-34f1024a83aea66fac6f7bdae72ae09f45534ae8.tar nixlib-34f1024a83aea66fac6f7bdae72ae09f45534ae8.tar.gz nixlib-34f1024a83aea66fac6f7bdae72ae09f45534ae8.tar.bz2 nixlib-34f1024a83aea66fac6f7bdae72ae09f45534ae8.tar.lz nixlib-34f1024a83aea66fac6f7bdae72ae09f45534ae8.tar.xz nixlib-34f1024a83aea66fac6f7bdae72ae09f45534ae8.tar.zst nixlib-34f1024a83aea66fac6f7bdae72ae09f45534ae8.zip |
Merge pull request #28872 from disassembler/freewheeling
freewheeling: UNSTABLE -> 0.6.2
Diffstat (limited to 'pkgs/applications')
-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 f37b44f92317..25704d262801 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" ]; |