pyrox.dev
Merge pull request #28872 from disassembler/freewheeling
freewheeling: UNSTABLE -> 0.6.2
authored by Jörg Thalheim and committed by GitHub 34f1024a 7b20952c
+10
-8
pkgs/applications/audio/freewheeling/default.nix
+10
-8
pkgs/applications/audio/freewheeling/default.nix
···
1
-
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, gnutls, freetype
1
+
{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, gnutls, freetype
2
2
, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis
3
-
, libSM, libsndfile, libogg
3
+
, libSM, libsndfile, libogg, libtool
4
4
}:
5
+
let
6
+
makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL");
7
+
in
5
8
6
9
stdenv.mkDerivation rec {
7
10
name = "freewheeling-${version}";
8
-
version = "2016-11-15";
11
+
version = "0.6.2";
9
12
10
13
src = fetchFromGitHub {
11
14
owner = "free-wheeling";
12
15
repo = "freewheeling";
13
-
rev = "05ef3bf150fa6ba1b1d437b1fd70ef363289742f";
14
-
sha256 = "19plf7r0sq4271ln5bya95mp4i1j30x8hsxxga2kla27z953n9ih";
16
+
rev = "v${version}";
17
+
sha256 = "01hmp0jxzxpb5sl0x91hdlwmbw9n4yffrpra4f89s4n8cixrz3d9";
15
18
};
16
19
17
-
nativeBuildInputs = [ pkgconfig autoreconfHook ];
20
+
nativeBuildInputs = [ pkgconfig autoreconfHook libtool ];
18
21
buildInputs = [
19
22
freetype SDL SDL_gfx SDL_ttf
20
23
liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM
···
22
25
configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ];
23
26
}))
24
27
];
25
-
26
-
patches = [ ./am_path_sdl.patch ./xml.patch ];
28
+
NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_ttf SDL_gfx ] ++ [ "-I${libxml2.dev}/include/libxml2" ];
27
29
28
30
hardeningDisable = [ "format" ];
29
31