Merge pull request #215200 from superherointj/pkg-SDL2_image-2.6.3 (09d198fc) · Commits · nix / nixpkgs

pkgs/development/libraries/SDL2_image/default.nix

+8 −3

Original line number	Diff line number	Diff line
		{ lib, stdenv, fetchurl
		, pkg-config
		, SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation
		, version ? "2.6.3"
		, hash ? "sha256-kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw="
		}:

		stdenv.mkDerivation rec {
		let
		pname = "SDL2_image";
		version = "2.0.5";
		in

		stdenv.mkDerivation {
		inherit pname version;

		src = fetchurl {
		url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz";
		sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx";
		inherit hash;
		};

		nativeBuildInputs = [ pkg-config ];

+7 −1

Original line number	Diff line number	Diff line
		@@ -23053,6 +23053,10 @@ with pkgs;
		SDL2_image = callPackage ../development/libraries/SDL2_image {
		inherit (darwin.apple_sdk.frameworks) Foundation;
		};
		SDL2_image_2_0_5 = SDL2_image.override({ # Pinned for pygame, toppler
		version = "2.0.5";
		hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA";
		});

		SDL2_mixer = callPackage ../development/libraries/SDL2_mixer {
		inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
		@@ -35751,7 +35755,9 @@ with pkgs;

		tome4 = callPackage ../games/tome4 { };

		toppler = callPackage ../games/toppler { };
		toppler = callPackage ../games/toppler {
		SDL2_image = SDL2_image_2_0_5;
		};

		torus-trooper = callPackage ../games/torus-trooper { };

+1 −0

Original line number	Diff line number	Diff line
		@@ -8072,6 +8072,7 @@ self: super: with self; {

		pygame = callPackage ../development/python-modules/pygame {
		inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;
		SDL2_image = pkgs.SDL2_image_2_0_5;
		};

		pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { };