Merge pull request #280985 from wegank/ogre-freeimage

ogre: drop freeimage
2024-01-20 15:06:04 +00:00 · 2024-01-20 15:06:04 +00:00 · a95a4c1544
commit a95a4c1544
parent 40b79a8cce 672a13811c
2 changed files with 7 additions and 2 deletions
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@ -6,7 +6,6 @@
 , unzip
 , SDL2
 , boost
-, freeimage
 , freetype
 , libpng
 , ois
@ -55,7 +54,6 @@ let
    buildInputs = [
      SDL2
      boost
-      freeimage
      freetype
      libpng
      ois
--- a/pkgs/games/stuntrally/default.nix
+++ b/pkgs/games/stuntrally/default.nix
@ -48,6 +48,13 @@ stdenv.mkDerivation rec {
    hash = "sha256-fglm1FetFGHM/qGTtpxDb8+k2iAREn5DQR5GPujuLms=";
  };

+  postPatch = ''
+    substituteInPlace config/*-default.cfg \
+      --replace "screenshot_png = off" "screenshot_png = on"
+    substituteInPlace source/*/BaseApp_Create.cpp \
+      --replace "Codec_FreeImage" "Codec_STBI"
+  '';
+
  preConfigure = ''
    rmdir data/tracks
    ln -s ${tracks}/ data/tracks