From c3fa9d6d0bff5c19cb733226f2f9d6a9b536299a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 7 Jun 2024 11:21:10 -0300 Subject: [PATCH 1/7] SDL2_image: migrate to by-name --- .../default.nix => by-name/sd/SDL2_image/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/libraries/SDL2_image/default.nix => by-name/sd/SDL2_image/package.nix} (100%) diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/by-name/sd/SDL2_image/package.nix similarity index 100% rename from pkgs/development/libraries/SDL2_image/default.nix rename to pkgs/by-name/sd/SDL2_image/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32dadb301c0e..bcb895e6fa2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23980,7 +23980,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; - SDL2_image = callPackage ../development/libraries/SDL2_image { + SDL2_image = callPackage ../by-name/sd/SDL2_image/package.nix { inherit (darwin.apple_sdk.frameworks) Foundation; }; # Pinned for pygame, toppler From 093e3b60d33223529d32b8865a08e61a7e573b35 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 7 Jun 2024 11:34:40 -0300 Subject: [PATCH 2/7] SDL2_image: refactor - internalize `darwin` - reorder input set - new input: enableSdltest - reorder buildInputs - rewrite configureFlags - get rid of nested with - SDL team Caution: can cause mass rebuilds. --- pkgs/by-name/sd/SDL2_image/package.nix | 64 +++++++++++++++++++------- pkgs/top-level/all-packages.nix | 3 -- 2 files changed, 47 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix index 03b3f146ca93..20eb05732f9c 100644 --- a/pkgs/by-name/sd/SDL2_image/package.nix +++ b/pkgs/by-name/sd/SDL2_image/package.nix @@ -1,8 +1,25 @@ -{ lib, stdenv, fetchurl -, pkg-config -, SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation +{ + lib, + SDL2, + darwin, + fetchurl, + giflib, + libXpm, + libjpeg, + libpng, + libtiff, + libwebp, + pkg-config, + stdenv, + zlib, + # Boolean flags + ## Darwin headless will hang when trying to run the SDL test program + enableSdltest ? (!stdenv.isDarwin), }: +let + inherit (darwin.apple_sdk.frameworks) Foundation; +in stdenv.mkDerivation (finalAttrs: { pname = "SDL2_image"; version = "2.8.2"; @@ -14,29 +31,42 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL2 libpng libjpeg libtiff giflib libwebp libXpm zlib ] - ++ lib.optional stdenv.isDarwin Foundation; + buildInputs = [ + SDL2 + giflib + libXpm + libjpeg + libpng + libtiff + libwebp + zlib + ] + ++ lib.optionals stdenv.isDarwin [ + Foundation + ]; configureFlags = [ # Disable dynamically loaded dependencies - "--disable-jpg-shared" - "--disable-png-shared" - "--disable-tif-shared" - "--disable-webp-shared" + (lib.enableFeature false "jpg-shared") + (lib.enableFeature false "png-shared") + (lib.enableFeature false "tif-shared") + (lib.enableFeature false "webp-shared") + (lib.enableFeature enableSdltest "sdltest") ] ++ lib.optionals stdenv.isDarwin [ - # Darwin headless will hang when trying to run the SDL test program - "--disable-sdltest" # Don't use native macOS frameworks - "--disable-imageio" + # Caution: do not set this as (!stdenv.isDarwin) since it would be true + # outside Darwin - and ImageIO does not exist outisde Darwin + (lib.enableFeature false "imageio") ]; enableParallelBuilding = true; - meta = with lib; { + meta = { description = "SDL image library"; - homepage = "http://www.libsdl.org/projects/SDL_image/"; - platforms = platforms.unix; - license = licenses.zlib; - maintainers = with maintainers; [ cpages ]; + homepage = "https://github.com/libsdl-org/SDL_image"; + license = lib.licenses.zlib; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ cpages ]); + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcb895e6fa2d..67dc91b624c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23980,9 +23980,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; - SDL2_image = callPackage ../by-name/sd/SDL2_image/package.nix { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; # Pinned for pygame, toppler SDL2_image_2_0 = SDL2_image.overrideAttrs (oldAttrs: { version = "2.0.5"; From 7f084a8532ffb264473b5f4bb3c3fd51efce5060 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 10 Jul 2024 22:28:04 -0300 Subject: [PATCH 3/7] SDL2_image: set strictDeps as true --- pkgs/by-name/sd/SDL2_image/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix index 20eb05732f9c..73af43bffcfd 100644 --- a/pkgs/by-name/sd/SDL2_image/package.nix +++ b/pkgs/by-name/sd/SDL2_image/package.nix @@ -29,7 +29,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-j0hrv7z4Rk3VjJ5dkzlKsCVc5otRxalmqRgkSCCnbdw="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + SDL2 + pkg-config + ]; buildInputs = [ SDL2 @@ -59,6 +62,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature false "imageio") ]; + strictDeps = true; + enableParallelBuilding = true; meta = { From 1f8f3e7c402d85ee6737d0ec5ff498873232354e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 10 Jul 2024 22:30:35 -0300 Subject: [PATCH 4/7] SDL2_image: nixfmt --- pkgs/by-name/sd/SDL2_image/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix index 73af43bffcfd..3db69218078e 100644 --- a/pkgs/by-name/sd/SDL2_image/package.nix +++ b/pkgs/by-name/sd/SDL2_image/package.nix @@ -43,10 +43,7 @@ stdenv.mkDerivation (finalAttrs: { libtiff libwebp zlib - ] - ++ lib.optionals stdenv.isDarwin [ - Foundation - ]; + ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; configureFlags = [ # Disable dynamically loaded dependencies @@ -70,8 +67,7 @@ stdenv.mkDerivation (finalAttrs: { description = "SDL image library"; homepage = "https://github.com/libsdl-org/SDL_image"; license = lib.licenses.zlib; - maintainers = lib.teams.sdl.members - ++ (with lib.maintainers; [ cpages ]); + maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ cpages ]); platforms = lib.platforms.unix; }; }) From a91743a5f3a667aa6987c86c58466e2712143246 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 10 Jul 2024 22:31:35 -0300 Subject: [PATCH 5/7] SDL2_image: remove cpages from meta.maintainers No activity since a long time. --- pkgs/by-name/sd/SDL2_image/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix index 3db69218078e..2af81bd18cb7 100644 --- a/pkgs/by-name/sd/SDL2_image/package.nix +++ b/pkgs/by-name/sd/SDL2_image/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { description = "SDL image library"; homepage = "https://github.com/libsdl-org/SDL_image"; license = lib.licenses.zlib; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ cpages ]); + maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); platforms = lib.platforms.unix; }; }) From 108d37991f17054f036a6fffb3d113828081a0d6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 7 Jun 2024 11:42:58 -0300 Subject: [PATCH 6/7] SDL2_image_2_0: migrate to by-name --- pkgs/by-name/sd/SDL2_image_2_0/package.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 8 -------- 2 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 pkgs/by-name/sd/SDL2_image_2_0/package.nix diff --git a/pkgs/by-name/sd/SDL2_image_2_0/package.nix b/pkgs/by-name/sd/SDL2_image_2_0/package.nix new file mode 100644 index 000000000000..c52a60637766 --- /dev/null +++ b/pkgs/by-name/sd/SDL2_image_2_0/package.nix @@ -0,0 +1,14 @@ +# Dependency of pygame, toppler +{ + lib, + SDL2_image, + fetchurl, +}: + +SDL2_image.overrideAttrs (oldAttrs: { + version = "2.0.5"; + src = fetchurl { + inherit (oldAttrs.src) url; + hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67dc91b624c2..525ef43e9599 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23980,14 +23980,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; - # Pinned for pygame, toppler - SDL2_image_2_0 = SDL2_image.overrideAttrs (oldAttrs: { - version = "2.0.5"; - src = fetchurl { - inherit (oldAttrs.src) url; - hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA"; - }; - }); # Pinned for hedgewars: # https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786 SDL2_image_2_6 = SDL2_image.overrideAttrs (oldAttrs: { From cea3c9fbe57bf03d06283b88816bbad1fd8f7266 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 7 Jun 2024 11:43:47 -0300 Subject: [PATCH 7/7] SDL2_image_2_6: migrate to by-name --- pkgs/by-name/sd/SDL2_image_2_6/package.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 10 ---------- 2 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 pkgs/by-name/sd/SDL2_image_2_6/package.nix diff --git a/pkgs/by-name/sd/SDL2_image_2_6/package.nix b/pkgs/by-name/sd/SDL2_image_2_6/package.nix new file mode 100644 index 000000000000..ef57e146098e --- /dev/null +++ b/pkgs/by-name/sd/SDL2_image_2_6/package.nix @@ -0,0 +1,15 @@ +# Dependency for hedgewars: +# https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786 +{ + lib, + SDL2_image, + fetchurl, +}: + +SDL2_image.overrideAttrs (oldAttrs: { + version = "2.6.3"; + src = fetchurl { + inherit (oldAttrs.src) url; + hash = "sha256-kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw="; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 525ef43e9599..1fd43c9b3470 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23980,16 +23980,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; - # Pinned for hedgewars: - # https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786 - SDL2_image_2_6 = SDL2_image.overrideAttrs (oldAttrs: { - version = "2.6.3"; - src = fetchurl { - inherit (oldAttrs.src) url; - hash = "sha256-kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw="; - }; - }); - sdrplay = callPackage ../applications/radio/sdrplay { }; sdr-j-fm = libsForQt5.callPackage ../applications/radio/sdr-j-fm { };