From 94a07ab3aebd2677a84b6f1ebfb25b4d5fc2199a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 12 Dec 2015 20:29:18 +0300 Subject: [PATCH] fmod42416: fix upstream url, use provided Makefile --- pkgs/development/libraries/fmod/4.24.16.nix | 29 ++++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/fmod/4.24.16.nix b/pkgs/development/libraries/fmod/4.24.16.nix index d1768d656b4d..b78b1a46e257 100644 --- a/pkgs/development/libraries/fmod/4.24.16.nix +++ b/pkgs/development/libraries/fmod/4.24.16.nix @@ -11,12 +11,12 @@ let src = (if (bits == "64") then fetchurl { - url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi42416linux64.tar.gz"; + url = "http://zandronum.com/essentials/fmod/fmodapi42416linux64.tar.gz"; sha256 = "0hkwlzchzzgd7fanqznbv5bs53z2qy8iiv9l2y77l4sg1jwmlm6y"; } else fetchurl { - url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi42416linux.tar.gz"; + url = "http://zandronum.com/essentials/fmod/fmodapi42416linux.tar.gz"; sha256 = "13diw3ax2slkr99mwyjyc62b8awc30k0z08cvkpk2p3i1j6f85m5"; } ); @@ -28,23 +28,26 @@ stdenv.mkDerivation rec { version = "4.24.16"; dontStrip = true; + dontPatchELF = true; + + makeFlags = [ "DESTLIBDIR=$(out)/lib" "DESTHDRDIR=$(out)/include" ]; + buildPhase = "true"; - installPhase = '' - mkdir -p $out/lib $out/include/fmodex - cd api/inc && cp * $out/include/fmodex && cd ../lib - cp libfmodex${bits}-${version}.so $out/lib/libfmodex.so - cp libfmodex${bits}L-${version}.so $out/lib/libfmodexL.so - - ${patchLib "$out/lib/libfmodex.so"} - ${patchLib "$out/lib/libfmodexL.so"} + preInstall = '' + mkdir -p $out/lib ''; - meta = { + postInstall = '' + mv $out/lib/libfmodex${bits}-${version}.so $out/lib/libfmodex.so + mv $out/lib/libfmodexp${bits}-${version}.so $out/lib/libfmodexp.so + ''; + + meta = with stdenv.lib; { description = "Programming library and toolkit for the creation and playback of interactive audio"; homepage = "http://www.fmod.org/"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.linux; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; maintainers = [ stdenv.lib.maintainers.lassulus ]; }; }