From 9e68af6fab100f31e3d57ffc96d6c115e08786d7 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 15 Mar 2025 12:44:03 +0100
Subject: [PATCH] hedgewars: update to unstable and drop the pinned SDL2_image

---
 pkgs/by-name/he/hedgewars/package.nix      | 22 +++++++++++-----------
 pkgs/by-name/sd/SDL2_image_2_6/package.nix | 11 -----------
 2 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/by-name/sd/SDL2_image_2_6/package.nix

diff --git a/pkgs/by-name/he/hedgewars/package.nix b/pkgs/by-name/he/hedgewars/package.nix
index 7eda2102ef82..387ba5905b2b 100644
--- a/pkgs/by-name/he/hedgewars/package.nix
+++ b/pkgs/by-name/he/hedgewars/package.nix
@@ -1,6 +1,6 @@
 {
   stdenv,
-  SDL2_image_2_6,
+  SDL2_image,
   SDL2_ttf,
   SDL2_net,
   fpc,
@@ -8,7 +8,8 @@
   ffmpeg,
   libglut,
   lib,
-  fetchurl,
+  fetchhg,
+  fetchpatch,
   cmake,
   pkg-config,
   lua5_1,
@@ -20,7 +21,6 @@
   libGLU,
   physfs,
   qt5,
-  llvm,
   withServer ? true,
 }:
 
@@ -43,13 +43,14 @@ let
     ]
   );
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "hedgewars";
-  version = "1.0.2";
+  version = "1.0.2-unstable-2024-03-24";
 
-  src = fetchurl {
-    url = "https://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2";
-    sha256 = "sha256-IB/l5FvYyls9gbGOwGvWu8n6fCxjvwGQBeL4C+W88hI=";
+  src = fetchhg {
+    url = "https://hg.hedgewars.org/hedgewars/";
+    rev = "fcc98c953b5e";
+    hash = "sha256-bUmyYXmhOYjvbd0elyNnaUx3X1QJl3w2/hpxFK9KQCE=";
   };
 
   patches = [
@@ -73,10 +74,9 @@ stdenv.mkDerivation rec {
     SDL2_net
     SDL2
     SDL2_mixer
-    SDL2_image_2_6
+    SDL2_image
     fpc
     lua5_1
-    llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64
     ffmpeg
     libglut
     physfs
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [
     SDL2.out
-    SDL2_image_2_6
+    SDL2_image
     SDL2_mixer
     SDL2_net
     SDL2_ttf
diff --git a/pkgs/by-name/sd/SDL2_image_2_6/package.nix b/pkgs/by-name/sd/SDL2_image_2_6/package.nix
deleted file mode 100644
index edd912311b82..000000000000
--- a/pkgs/by-name/sd/SDL2_image_2_6/package.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dependency for hedgewars:
-# https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786
-{ SDL2_image, fetchurl }:
-
-SDL2_image.overrideAttrs (oldAttrs: {
-  version = "2.6.3";
-  src = fetchurl {
-    inherit (oldAttrs.src) url;
-    hash = "sha256-kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw=";
-  };
-})