nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-21 19:44:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

SDL2_image_2_0: use finalAttrs, remove version,hash from inputs, remove patch version from attr

Browse Source
This commit is contained in:
Sandro Jäckel 2023-02-18 17:33:02 +01:00
parent fd309df083
commit 267373a696
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/SDL2_image/default.nix
View File

@ -1,20 +1,15 @@
{ lib, stdenv, fetchurl { lib, stdenv, fetchurl
, pkg-config , pkg-config
, SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation , SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation
, version ? "2.8.2"
, hash ? "sha256-j0hrv7z4Rk3VjJ5dkzlKsCVc5otRxalmqRgkSCCnbdw="
}: }:
let stdenv.mkDerivation (finalAttrs: {
pname = "SDL2_image"; pname = "SDL2_image";
in version = "2.8.2";
stdenv.mkDerivation {
inherit pname version;
src = fetchurl { src = fetchurl {
url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz"; url = "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${finalAttrs.version}.tar.gz";
inherit hash; hash = "sha256-j0hrv7z4Rk3VjJ5dkzlKsCVc5otRxalmqRgkSCCnbdw=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
@ -44,4 +39,4 @@ stdenv.mkDerivation {
license = licenses.zlib; license = licenses.zlib;
maintainers = with maintainers; [ cpages ]; maintainers = with maintainers; [ cpages ];
}; };
} })

21
pkgs/top-level/all-packages.nix
View File

@ -24890,15 +24890,22 @@ with pkgs;
SDL2_image = callPackage ../development/libraries/SDL2_image { SDL2_image = callPackage ../development/libraries/SDL2_image {
inherit (darwin.apple_sdk.frameworks) Foundation; inherit (darwin.apple_sdk.frameworks) Foundation;
}; };
SDL2_image_2_0_5 = SDL2_image.override({ # Pinned for pygame, toppler # Pinned for pygame, toppler
SDL2_image_2_0 = SDL2_image.overrideAttrs (oldAttrs: {
version = "2.0.5"; version = "2.0.5";
hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA"; src = fetchurl {
inherit (oldAttrs.src) url;
hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA";
};
}); });
SDL2_image_2_6 = SDL2_image.override({ # Pinned for hedgewars:
# Pinned for hedgewars: # https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786
# https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786 SDL2_image_2_6 = SDL2_image.overrideAttrs (oldAttrs: {
version = "2.6.3"; version = "2.6.3";
hash = "sha256-kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw="; src = fetchurl {
inherit (oldAttrs.src) url;
hash = "sha256-kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw=";
};
}); });
SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { SDL2_mixer = callPackage ../development/libraries/SDL2_mixer {
@ -38383,7 +38390,7 @@ with pkgs;
tome4 = callPackage ../games/tome4 { }; tome4 = callPackage ../games/tome4 { };
toppler = callPackage ../games/toppler { toppler = callPackage ../games/toppler {
SDL2_image = SDL2_image_2_0_5; SDL2_image = SDL2_image_2_0;
}; };
torus-trooper = callPackage ../games/torus-trooper { }; torus-trooper = callPackage ../games/torus-trooper { };

2
pkgs/top-level/python-packages.nix
View File

@ -10444,7 +10444,7 @@ self: super: with self; {
pygame = callPackage ../development/python-modules/pygame { pygame = callPackage ../development/python-modules/pygame {
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;
SDL2_image = pkgs.SDL2_image_2_0_5; SDL2_image = pkgs.SDL2_image_2_0;
}; };
pygame-sdl2 = callPackage ../development/python-modules/pygame-sdl2 { }; pygame-sdl2 = callPackage ../development/python-modules/pygame-sdl2 { };