Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 16 insertions, 8 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/games/solarus/default.nix b/infra/libkookie/nixpkgs/pkgs/games/solarus/default.nix
index c0daa99c15a6..c204846ae2fc 100644
--- a/infra/libkookie/nixpkgs/pkgs/games/solarus/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/games/solarus/default.nix
@@ -1,26 +1,34 @@
-{ lib, mkDerivation, fetchFromGitLab, cmake, luajit,
-  SDL2, SDL2_image, SDL2_ttf, physfs,
-  openal, libmodplug, libvorbis,
-  qtbase, qttools }:
+{ lib, mkDerivation, fetchFromGitLab, cmake, luajit
+,  SDL2, SDL2_image, SDL2_ttf, physfs, glm
+, openal, libmodplug, libvorbis
+, qtbase, qttools }:
 
 mkDerivation rec {
   pname = "solarus";
-  version = "1.6.2";
+  version = "1.6.4";
 
   src = fetchFromGitLab {
     owner = "solarus-games";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0d0xfjbmamz84aajxfc0fwrj8862xxbxz6n4xnc05r1m4g7gba77";
+    sha256 = "sbdlf+R9OskDQ5U5rqUX2gF8l/fj0sDJv6BL7H1I1Ng=";
   };
 
-  buildInputs = [ cmake luajit SDL2
+  outputs = [ "out" "lib" "dev" ];
+
+  nativeBuildInputs = [ cmake qttools ];
+  buildInputs = [ luajit SDL2
     SDL2_image SDL2_ttf physfs
     openal libmodplug libvorbis
-    qtbase qttools ];
+    qtbase glm ];
 
   enableParallelBuilding = true;
 
+  preFixup = ''
+    mkdir $lib/
+    mv $out/lib $lib
+  '';
+
   meta = with lib; {
     description = "A Zelda-like ARPG game engine";
     longDescription = ''