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

MilkyTracker: fix build, use system zlib and decompressor patch

Browse Source 
Also add JACK support
This commit is contained in:
Cillian de Róiste 2013-10-30 00:00:46 +01:00
parent 808962fe31
commit 39525c52d8
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/audio/milkytracker/decompressor_gzip.patch Normal file
View File

@ -0,0 +1,20 @@
https://bugs.archlinux.org/task/31324
https://410333.bugs.gentoo.org/attachment.cgi?id=322456
diff -ur src.old/compression/DecompressorGZIP.cpp src/compression/DecompressorGZIP.cpp
--- src.old/compression/DecompressorGZIP.cpp 2012-08-28 17:54:46.000000000 +0200
+++ src/compression/DecompressorGZIP.cpp 2012-08-28 17:55:21.000000000 +0200
@@ -57,11 +57,11 @@
bool DecompressorGZIP::decompress(const PPSystemString& outFileName, Hints hint)
{
- gzFile *gz_input_file = NULL;
+ gzFile gz_input_file = NULL;
int len = 0;
pp_uint8 *buf;
- if ((gz_input_file = (void **)gzopen (fileName.getStrBuffer(), "r")) == NULL)
+ if ((gz_input_file = gzopen (fileName.getStrBuffer(), "r")) == NULL)
return false;
if ((buf = new pp_uint8[0x10000]) == NULL)

23
pkgs/applications/audio/milkytracker/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, SDL, automake, autoconf, perl}:
{ stdenv, fetchurl, alsaLib, SDL, automake, autoconf, jackaudio, perl, zlib, zziplib }:
stdenv.mkDerivation rec {
version = "0.90.85";
@ -20,26 +20,17 @@ stdenv.mkDerivation rec {
sha256 = "0gwd4zslbd8kih80k4v7n2c65kvm2cq3kl6d7y33z1l007vzyvf6";
};
preConfigure = ''
patch ./src/tracker/sdl/SDL_Main.cpp < ${fix_64bit_patch}
patch < ${no_zzip_patch}
patchPhase = ''
patch ./src/tracker/sdl/SDL_Main.cpp < ${fix_64bit_patch}
patch < ${no_zzip_patch}
patch ./src/compression/DecompressorGZIP.cpp < ${./decompressor_gzip.patch}
'';
# There's a zlib version included with milkytracker,
# but there's no makefiles for it. I've only included
# the header here, but it fails at link-time with
# several 'undefined reference' errors, which simply
# means it can't find the definitions, e.g. compiled
# zlib.
# There's bug reports on other package systems although
# unfortunately still unresolved.
# https://bugs.archlinux.org/task/31324
# http://lists.freebsd.org/pipermail/freebsd-ports/2013-March/082180.html
preBuild=''
export CPATH="`pwd`/src/compression/zlib/generic"
export CPATH=${zlib}/lib
'';
buildInputs = [ alsaLib SDL automake autoconf perl];
buildInputs = [ alsaLib SDL automake autoconf jackaudio perl zlib zziplib ];
meta = {
description = "Music tracker application, similar to Fasttracker II.";