From 77cefbe76af8a57e56286fba0555c68bffd39c39 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 15 Dec 2013 14:04:07 +0800 Subject: [PATCH 1/2] luajit: fix ldconfig to correct *.so files(symlinks) --- pkgs/development/interpreters/luajit/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index e5e3aed8d12..7c11be739f7 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl} : +{ stdenv, fetchurl }: stdenv.mkDerivation rec{ version = "2.0.2"; @@ -9,8 +9,12 @@ stdenv.mkDerivation rec{ sha256="0f3cykihfdn3gi6na9p0xjd4jnv26z18m441n5vyg42q9abh4ln0"; }; + patchPhase = '' + substituteInPlace Makefile \ + --replace ldconfig ${stdenv.glibc}/sbin/ldconfig + ''; + installPhase = '' - mkdir -p $out make install PREFIX=$out ''; From 87e572a3d1d2fcac31fe011d0c28414377cc6528 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 15 Dec 2013 14:24:28 +0800 Subject: [PATCH 2/2] add love-0.9.0 (use luajit by default) --- pkgs/development/interpreters/love/0.9.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/interpreters/love/0.9.nix diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix new file mode 100644 index 00000000000..b635b5e477c --- /dev/null +++ b/pkgs/development/interpreters/love/0.9.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig +, SDL2, mesa, openal, luajit +, libdevil, freetype, physfs +, libmodplug, mpg123, libvorbis, libogg +}: + +stdenv.mkDerivation rec { + name = "love-0.9.0"; + src = fetchurl { + url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz"; + sha256 = "048n94584cnmdaf2rshakdzbj1lz2yd7k08aiykkpz13aaa283ag"; + }; + + buildInputs = [ + pkgconfig SDL2 mesa openal luajit + libdevil freetype physfs libmodplug mpg123 libvorbis libogg + ]; + + configureFlags = [ + "--with-lua=luajit" + ]; + + meta = { + homepage = "http://love2d.org"; + description = "A Lua-based 2D game engine/scripting language"; + license = "zlib"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f82bcb442f3..9bf0df0c799 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3209,6 +3209,7 @@ let love = callPackage ../development/interpreters/love {lua=lua5;}; love_luajit = callPackage ../development/interpreters/love {lua=luajit;}; + love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; lua4 = callPackage ../development/interpreters/lua-4 { }; lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { };