mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 20:33:21 +00:00
Merge pull request #155069 from wackbyte/update-love
love: updates, fetch from GitHub, refactor name to pname + version, etc
This commit is contained in:
commit
22a2be05ea
@ -1,17 +1,15 @@
|
||||
{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
|
||||
libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
|
||||
libtheora, which, autoconf, automake, libtool
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config
|
||||
, SDL2, libGLU, libGL, openal, luajit
|
||||
, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg
|
||||
, libtheora, which, autoconf, automake, libtool
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "love";
|
||||
version = "0.10.2";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
src = fetchFromBitbucket {
|
||||
owner = "rude";
|
||||
src = fetchFromGitHub {
|
||||
owner = "love2d";
|
||||
repo = "love";
|
||||
rev = version;
|
||||
sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym";
|
||||
@ -32,7 +30,7 @@ stdenv.mkDerivation {
|
||||
NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3
|
||||
|
||||
meta = {
|
||||
homepage = "http://love2d.org";
|
||||
homepage = "https://love2d.org";
|
||||
description = "A Lua-based 2D game engine/scripting language";
|
||||
license = lib.licenses.zlib;
|
||||
platforms = lib.platforms.linux;
|
||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/rude/love/downloads/love-${version}-linux-src.tar.gz";
|
||||
url = "https://github.com/love2d/love/releases/download/${version}/love-${version}-linux-src.tar.gz";
|
||||
sha256 = "0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5";
|
||||
};
|
||||
|
||||
@ -48,10 +48,9 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://love2d.org";
|
||||
homepage = "https://love2d.org";
|
||||
description = "A Lua-based 2D game engine/scripting language";
|
||||
license = lib.licenses.zlib;
|
||||
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
};
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/rude/love/downloads/${pname}-${version}-linux-src.tar.gz";
|
||||
url = "https://github.com/love2d/love/releases/download/${version}/love-${version}-linux-src.tar.gz";
|
||||
sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi";
|
||||
};
|
||||
|
||||
@ -45,10 +45,9 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "http://love2d.org";
|
||||
homepage = "https://love2d.org";
|
||||
description = "A Lua-based 2D game engine/scripting language";
|
||||
license = lib.licenses.zlib;
|
||||
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
};
|
||||
|
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "love";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/rude/love/downloads/love-${version}-linux-src.tar.gz";
|
||||
sha256 = "1pikd0bzb44r4bf0jbgn78whz1yswpq1n5jc8nf87v42pm30kp84";
|
||||
url = "https://github.com/love2d/love/releases/download/${version}/love-${version}-linux-src.tar.gz";
|
||||
sha256 = "0wn1npr5gal5b1idh4a5fwc3f5c36lsbjd4r4d699rqlviid15d9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@ -26,10 +26,9 @@ stdenv.mkDerivation rec {
|
||||
NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3
|
||||
|
||||
meta = {
|
||||
homepage = "http://love2d.org";
|
||||
homepage = "https://love2d.org";
|
||||
description = "A Lua-based 2D game engine/scripting language";
|
||||
license = lib.licenses.zlib;
|
||||
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
broken = true;
|
||||
|
@ -1,20 +1,18 @@
|
||||
{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
|
||||
libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
|
||||
libtheora, which, autoconf, automake, libtool
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config
|
||||
, SDL2, libGLU, libGL, openal, luajit
|
||||
, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg
|
||||
, libtheora, which, autoconf, automake, libtool
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "love";
|
||||
version = "11.3";
|
||||
in
|
||||
version = "11.4";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
src = fetchFromBitbucket {
|
||||
owner = "rude";
|
||||
src = fetchFromGitHub {
|
||||
owner = "love2d";
|
||||
repo = "love";
|
||||
rev = version;
|
||||
sha256 = "18gfp65ngb8k8g7hgbw2bhrwk2i7m56m21d39pk4484q9z8p4vm7";
|
||||
sha256 = "0kpdp6v8m8j0r7ppyy067shr0lfgrlh0dwb7ccws76d389vizwhb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@ -32,7 +30,7 @@ stdenv.mkDerivation {
|
||||
NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3
|
||||
|
||||
meta = {
|
||||
homepage = "http://love2d.org";
|
||||
homepage = "https://love2d.org";
|
||||
description = "A Lua-based 2D game engine/scripting language";
|
||||
license = lib.licenses.zlib;
|
||||
platforms = lib.platforms.linux;
|
@ -13532,7 +13532,7 @@ with pkgs;
|
||||
love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; };
|
||||
love_0_9 = callPackage ../development/interpreters/love/0.9.nix { };
|
||||
love_0_10 = callPackage ../development/interpreters/love/0.10.nix { };
|
||||
love_11 = callPackage ../development/interpreters/love/11.1.nix { };
|
||||
love_11 = callPackage ../development/interpreters/love/11.nix { };
|
||||
love = love_0_10;
|
||||
|
||||
wabt = callPackage ../development/tools/wabt { };
|
||||
|
Loading…
Reference in New Issue
Block a user