Merge pull request #308379 from atorres1985-contrib/SDL (54908bcc) · Commits · nix / nixpkgs

maintainers/team-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -962,6 +962,12 @@ with lib.maintainers; {
		shortName = "SageMath";
		};

		sdl = {
		members = [ ];
		scope = "Maintain SDL libraries.";
		shortName = "SDL";
		};

		sphinx = {
		members = [ ];
		scope = "Maintain Sphinx related packages.";

pkgs/applications/misc/vp/default.nix

deleted100644 → 0

+0 −28

Original line number	Diff line number	Diff line
		{ lib, stdenv, fetchFromGitHub, autoreconfHook, SDL, SDL_image }:

		stdenv.mkDerivation rec {
		pname = "vp";
		version = "1.8";

		src = fetchFromGitHub {
		owner = "erikg";
		repo = "vp";
		rev = "v${version}";
		sha256 = "08q6xrxsyj6vj0sz59nix9isqz84gw3x9hym63lz6v8fpacvykdq";
		};

		nativeBuildInputs = [ autoreconfHook ];

		buildInputs = [ SDL SDL_image ];

		env.NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL -I${SDL_image}/include/SDL";

		meta = with lib; {
		homepage = "https://brlcad.org/~erik/";
		description = "SDL based picture viewer/slideshow";
		platforms = platforms.unix;
		license = licenses.gpl3;
		maintainers = [ maintainers.vrthra ];
		mainProgram = "vp";
		};
		}

pkgs/games/btanks/default.nix→pkgs/by-name/bt/btanks/package.nix

+51 −17

Original line number	Diff line number	Diff line
		{ lib, stdenv, fetchurl, fetchpatch, scons, pkg-config, SDL, libGL, zlib, smpeg
		, SDL_image, libvorbis, expat, zip, lua }:
		{
		lib,
		SDL,
		SDL_image,
		expat,
		fetchpatch,
		fetchurl,
		libGL,
		libvorbis,
		lua,
		pkg-config,
		scons,
		smpeg,
		stdenv,
		zip,
		zlib,
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "btanks";
		version = "0.9.8083";

		src = fetchurl {
		url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
		url = "mirror://sourceforge/btanks/btanks-${finalAttrs.version}.tar.bz2";
		hash = "sha256-P9LOaitF96YMOxFPqa/xPLPdn7tqZc3JeYt2xPosQ0E=";
		};

		nativeBuildInputs = [ scons pkg-config ];

		buildInputs = [ SDL libGL zlib smpeg SDL_image libvorbis expat zip lua ];

		enableParallelBuilding = true;

		env.NIX_CFLAGS_COMPILE = "-I${SDL_image}/include/SDL";

		patches = [
		(fetchpatch {
		name = "lua52.patch";
		@@ -42,10 +49,37 @@ stdenv.mkDerivation rec {
		})
		];

		meta = with lib; {
		description = "Fast 2d tank arcade game";
		nativeBuildInputs = [
		SDL
		pkg-config
		scons
		smpeg
		zip
		];

		buildInputs = [
		SDL
		SDL_image
		expat
		libGL
		libvorbis
		lua
		smpeg
		zlib
		];

		env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL_image}/include/SDL";

		enableParallelBuilding = true;

		strictDeps = true;

		meta = {
		homepage = "https://sourceforge.net/projects/btanks/";
		license = licenses.gpl2Plus;
		platforms = platforms.linux;
		description = "Fast 2d tank arcade game with multiplayer and split-screen modes";
		license = lib.licenses.gpl2Plus;
		mainProgram = "btanks";
		maintainers = with lib.maintainers; [ AndersonTorres ];
		inherit (SDL.meta) platforms;
		};
		}
		})

pkgs/development/guile-modules/guile-sdl/default.nix→pkgs/by-name/gu/guile-sdl/package.nix

+28 −28

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchurl
		, guile
		, lzip
		, pkg-config
		, SDL
		, SDL_image
		, SDL_mixer
		, SDL_ttf
		, buildEnv
		{
		lib,
		SDL,
		SDL_image,
		SDL_mixer,
		SDL_ttf,
		buildEnv,
		fetchurl,
		guile,
		lzip,
		pkg-config,
		stdenv,
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "guile-sdl";
		version = "0.6.1";

		src = fetchurl {
		url = "mirror://gnu/${pname}/${pname}-${version}.tar.lz";
		url = "mirror://gnu/guile-sdl/guile-sdl-${finalAttrs.version}.tar.lz";
		hash = "sha256-/9sTTvntkRXck3FoRalROjqUQC8hkePtLTnHNZotKOE=";
		};

		strictDeps = true;

		nativeBuildInputs = [
		SDL
		guile
		lzip
		pkg-config
		SDL
		];

		buildInputs = [
		guile
		(lib.getDev SDL)
		SDL_image
		SDL_mixer
		SDL_ttf
		(lib.getDev SDL_image)
		(lib.getDev SDL_mixer)
		(lib.getDev SDL_ttf)
		guile
		];

		makeFlags =
		let
		sdl-env = buildEnv {
		name = "sdl-env";
		paths = buildInputs;
		paths = finalAttrs.buildInputs;
		};
		in
		[
		"SDLMINUSI=-I${sdl-env}/include/SDL"
		];

		meta = with lib; {
		strictDeps = true;

		meta = {
		homepage = "https://www.gnu.org/software/guile-sdl/";
		description = "Guile bindings for SDL";
		license = licenses.gpl3Plus;
		maintainers = with maintainers; [ vyp ];
		platforms = guile.meta.platforms;
		# configure: error: *** SDL version not found!
		broken = stdenv.isDarwin;
		license = lib.licenses.gpl3Plus;
		maintainers = lib.teams.sdl.members
		++ (with lib.maintainers; [ ]);
		inherit (guile.meta) platforms;
		};
		}
		})

pkgs/by-name/on/onscripter-en/package.nix

0 → 100644

+67 −0

Original line number	Diff line number	Diff line
		{
		lib,
		SDL,
		SDL_image,
		SDL_mixer,
		SDL_ttf,
		fetchFromGitHub,
		freetype,
		libjpeg,
		libogg,
		libpng,
		libvorbis,
		pkg-config,
		smpeg,
		stdenv,
		}:


		stdenv.mkDerivation (finalAttrs: {
		pname = "onscripter-en";
		version = "20110930";

		# The website is not available now. Let's use a Museoa backup
		src = fetchFromGitHub {
		owner = "museoa";
		repo = "onscripter-en";
		rev = finalAttrs.version;
		hash = "sha256-Lc5ZlH2C4ER02NmQ6icfiqpzVQdVUnOmdywGjjjSYSg=";
		};

		nativeBuildInputs = [
		SDL
		pkg-config
		smpeg
		];

		buildInputs = [
		SDL
		SDL_image
		SDL_mixer
		SDL_ttf
		freetype
		libjpeg
		libogg
		libpng
		libvorbis
		smpeg
		];

		configureFlags = [ "--no-werror" ];

		strictDeps = true;

		preBuild = ''
		sed -i 's/.dll//g' Makefile
		'';

		meta = {
		homepage = "http://github.com/museoa/onscripter-en";
		description = "Japanese visual novel scripting engine";
		license = lib.licenses.gpl2Plus;
		mainProgram = "onscripter-en";
		maintainers = with lib.maintainers; [ AndersonTorres ];
		platforms = lib.platforms.unix;
		broken = stdenv.isDarwin;
		};
		})