diff options
| author | Peter Hoeg <peter@hoeg.com> | 2018-09-13 12:21:08 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2018-09-13 12:21:39 +0800 |
| commit | 56b9f6fc8e1c3a4ad10ff7c61e461d7b7e038833 (patch) | |
| tree | 6c38b169fbe29f6c0bcf973221b67af64ade19aa /pkgs | |
| parent | 68b7de9e2e265fcec9255c729fcb152e7c71227c (diff) | |
| download | nixlib-56b9f6fc8e1c3a4ad10ff7c61e461d7b7e038833.tar nixlib-56b9f6fc8e1c3a4ad10ff7c61e461d7b7e038833.tar.gz nixlib-56b9f6fc8e1c3a4ad10ff7c61e461d7b7e038833.tar.bz2 nixlib-56b9f6fc8e1c3a4ad10ff7c61e461d7b7e038833.tar.lz nixlib-56b9f6fc8e1c3a4ad10ff7c61e461d7b7e038833.tar.xz nixlib-56b9f6fc8e1c3a4ad10ff7c61e461d7b7e038833.tar.zst nixlib-56b9f6fc8e1c3a4ad10ff7c61e461d7b7e038833.zip | |
milkytracker: 1.01 -> 1.02.00
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/audio/milkytracker/decompressor_gzip.patch | 20 | ||||
| -rw-r--r-- | pkgs/applications/audio/milkytracker/default.nix | 27 |
2 files changed, 12 insertions, 35 deletions
diff --git a/pkgs/applications/audio/milkytracker/decompressor_gzip.patch b/pkgs/applications/audio/milkytracker/decompressor_gzip.patch deleted file mode 100644 index c64421116dea..000000000000 --- a/pkgs/applications/audio/milkytracker/decompressor_gzip.patch +++ /dev/null @@ -1,20 +0,0 @@ -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) diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 6a71971c5fdf..6b3abeb1e23c 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,29 +1,26 @@ -{ stdenv, fetchurl, SDL2, alsaLib, cmake, libjack2, perl -, zlib, zziplib, pkgconfig, makeWrapper -}: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper +, SDL2, alsaLib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }: stdenv.mkDerivation rec { - version = "1.01"; + version = "1.02.00"; name = "milkytracker-${version}"; - src = fetchurl { - url = "https://github.com/milkytracker/MilkyTracker/archive/v${version}.00.tar.gz"; - sha256 = "1dvnddsnn9c83lz4dlm0cfjpc0m524amfkbalxbswdy0qc8cj1wv"; + src = fetchFromGitHub { + owner = "milkytracker"; + repo = "MilkyTracker"; + rev = "v${version}"; + sha256 = "05a6d7l98k9i82dwrgi855dnccm3f2lkb144gi244vhk1156n0ca"; }; - preBuild='' - export CPATH=${zlib.out}/lib - ''; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; - buildInputs = [ SDL2 alsaLib libjack2 perl zlib zziplib ]; + buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ]; - meta = { + meta = with stdenv.lib; { description = "Music tracker application, similar to Fasttracker II"; homepage = http://milkytracker.org; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.zoomulator ]; + maintainers = with maintainers; [ zoomulator ]; }; } |