summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichiel Leenaars <ml.software@leenaa.rs>2016-02-14 22:14:00 +0100
committerMichiel Leenaars <michiel@staff.isoc.nl>2016-02-15 17:10:26 +0100
commitf4a32be72988441cc67d0325cd85991505f547e2 (patch)
treef0a55cc7f1b86df582f78e9b96d2934b12fe4a5d /pkgs
parentc42b19e95d7f125095f2534491d959a87749e486 (diff)
downloadnixpkgs-f4a32be72988441cc67d0325cd85991505f547e2.tar
nixpkgs-f4a32be72988441cc67d0325cd85991505f547e2.tar.gz
nixpkgs-f4a32be72988441cc67d0325cd85991505f547e2.tar.bz2
nixpkgs-f4a32be72988441cc67d0325cd85991505f547e2.tar.lz
nixpkgs-f4a32be72988441cc67d0325cd85991505f547e2.tar.xz
nixpkgs-f4a32be72988441cc67d0325cd85991505f547e2.tar.zst
nixpkgs-f4a32be72988441cc67d0325cd85991505f547e2.zip
love: 0.8 -> 0.10.1
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/interpreters/love/0.10.nix38
-rw-r--r--pkgs/development/interpreters/love/0.8.nix (renamed from pkgs/development/interpreters/love/default.nix)0
-rw-r--r--pkgs/top-level/all-packages.nix5
3 files changed, 41 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix
new file mode 100644
index 00000000000..ed5aa1e60de
--- /dev/null
+++ b/pkgs/development/interpreters/love/0.10.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, mesa, openal, luajit,
+  libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
+  libtheora, which, autoconf, automake, libtool
+}:
+
+let
+  pname = "love";
+  version = "0.10.1";
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  src = fetchFromBitbucket {
+    owner = "rude";
+    repo = "love";
+    rev = "${version}";
+    sha256 = "10a2kkyx7x9jkcj9xrqgmvp0b6gbapjqjx9fib9f6a0nbz0xaswj";
+  };
+
+  buildInputs = [
+    pkgconfig SDL2 mesa openal luajit libdevil freetype physfs libmodplug mpg123
+    libvorbis libogg libtheora autoconf which libtool automake
+  ];
+
+  preConfigure = "$shell ./platform/unix/automagic";
+
+  configureFlags = [
+    "--with-lua=luajit"
+  ];
+
+  meta = {
+    homepage = "http://love2d.org";
+    description = "A Lua-based 2D game engine/scripting language";
+    license = stdenv.lib.licenses.zlib;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+  };
+}
diff --git a/pkgs/development/interpreters/love/default.nix b/pkgs/development/interpreters/love/0.8.nix
index fc1f01cb373..fc1f01cb373 100644
--- a/pkgs/development/interpreters/love/default.nix
+++ b/pkgs/development/interpreters/love/0.8.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 298bbfc1800..b16ae4744f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5221,9 +5221,10 @@ let
 
   lolcode = callPackage ../development/interpreters/lolcode { };
 
-  love = callPackage ../development/interpreters/love {lua=lua5_1;};
-  love_luajit = callPackage ../development/interpreters/love {lua=luajit;};
+  love_0_8 = callPackage ../development/interpreters/love/0.8.nix { };
   love_0_9 = callPackage ../development/interpreters/love/0.9.nix { };
+  love_0_10 = callPackage ../development/interpreters/love/0.10.nix { };
+  love = love_0_10;
 
   ### LUA MODULES