lime3ds: fix build (#348927)

pkgs/by-name/li/lime3ds/package.nix

@@ -1,45 +1,60 @@
-{ alsa-lib
-, boost
-, catch2_3
-, cmake
-, cryptopp
-, cpp-jwt
-, doxygen
-, enet
-, fetchzip
-, fmt
-, ffmpeg-headless
-, gamemode
-, httplib
-, inih
-, lib
-, libGL
-, libjack2
-, libpulseaudio
-, libunwind
-, libusb1
-, nlohmann_json
-, openal
-, openssl
-, pipewire
-, pkg-config
-, portaudio
-, sndio
-, spirv-tools
-, soundtouch
-, stdenv
-, vulkan-headers
-, vulkan-loader
-, xorg
-, zstd
-, enableSdl2Frontend ? true , SDL2
-, enableQt ? true , kdePackages
-, enableQtTranslations ? enableQt
-, enableCubeb ? true , cubeb
-, useDiscordRichPresence ? false , rapidjson
-}: let
-  inherit (lib) optional optionals cmakeBool optionalString getLib makeLibraryPath;
-in stdenv.mkDerivation (finalAttrs: {
+{
+  alsa-lib,
+  boost,
+  catch2_3,
+  cmake,
+  cryptopp,
+  cpp-jwt,
+  doxygen,
+  enet,
+  fetchpatch,
+  fetchzip,
+  fmt,
+  ffmpeg_6-headless,
+  gamemode,
+  httplib,
+  inih,
+  lib,
+  libGL,
+  libjack2,
+  libpulseaudio,
+  libunwind,
+  libusb1,
+  nlohmann_json,
+  openal,
+  openssl,
+  pipewire,
+  pkg-config,
+  portaudio,
+  sndio,
+  spirv-tools,
+  soundtouch,
+  stdenv,
+  vulkan-headers,
+  vulkan-loader,
+  xorg,
+  zstd,
+  enableSdl2Frontend ? true,
+  SDL2,
+  enableQt ? true,
+  kdePackages,
+  enableQtTranslations ? enableQt,
+  enableCubeb ? true,
+  cubeb,
+  useDiscordRichPresence ? false,
+  rapidjson,
+}:
+let
+  inherit (lib)
+    optional
+    optionals
+    cmakeBool
+    optionalString
+    getLib
+    makeLibraryPath
+    ;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "lime3ds";
   version = "2118.2";
 
@@ -52,45 +67,59 @@ in stdenv.mkDerivation (finalAttrs: {
     cmake
     doxygen
     pkg-config
-  ] ++ lib.optionals enableQt [kdePackages.wrapQtAppsHook];
+  ] ++ lib.optionals enableQt [ kdePackages.wrapQtAppsHook ];
 
-  buildInputs = [
-    alsa-lib
-    boost
-    catch2_3
-    cryptopp
-    cpp-jwt
-    enet
-    fmt
-    ffmpeg-headless
-    httplib
-    inih
-    libGL
-    libjack2
-    libpulseaudio
-    libunwind
-    libusb1
-    nlohmann_json
-    openal
-    openssl
-    pipewire
-    portaudio
-    SDL2
-    soundtouch
-    sndio
-    spirv-tools
-    vulkan-headers
-    xorg.libX11
-    xorg.libXext
-    zstd
-  ] ++ optionals enableQt (with kdePackages; [
-    qtbase
-    qtmultimedia
-    qttools
-    qtwayland
-  ]) ++ optionals enableQtTranslations [kdePackages.qttools]
-  ++ optionals enableCubeb [cubeb]
-  ++ optional useDiscordRichPresence rapidjson;
+  buildInputs =
+    [
+      alsa-lib
+      boost
+      catch2_3
+      cryptopp
+      cpp-jwt
+      enet
+      fmt
+      ffmpeg_6-headless
+      httplib
+      inih
+      libGL
+      libjack2
+      libpulseaudio
+      libunwind
+      libusb1
+      nlohmann_json
+      openal
+      openssl
+      pipewire
+      portaudio
+      SDL2
+      soundtouch
+      sndio
+      spirv-tools
+      vulkan-headers
+      xorg.libX11
+      xorg.libXext
+      zstd
+    ]
+    ++ optionals enableQt (
+      with kdePackages;
+      [
+        qtbase
+        qtmultimedia
+        qttools
+        qtwayland
+      ]
+    )
+    ++ optionals enableQtTranslations [ kdePackages.qttools ]
+    ++ optionals enableCubeb [ cubeb ]
+    ++ optional useDiscordRichPresence rapidjson;
+
+  patches = [
+    # FIXME: this patch fixes the build with newer QT versions, remove it when the new version gets released
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/Lime3DS/Lime3DS/pull/441.patch";
+      hash = "sha256-NKJ3fmh5kY/DaTCVbIz1dvJrvK5IbJt1eogrbXWciCI=";
+    })
+  ];
 
   postPatch = ''
     # Fix file not found when looking in var/empty instead of opt
@@ -106,35 +135,40 @@ in stdenv.mkDerivation (finalAttrs: {
       --replace-fail "libgamemode.so.0" "${getLib gamemode}/lib/libgamemode.so.0"
   '';
 
-  postInstall = let
-    libs = makeLibraryPath [ vulkan-loader ];
-  in optionalString enableSdl2Frontend ''
-    for binfile in lime3ds lime3ds-room
-    do
-      wrapProgram "$out/bin/$binfile" \
-        --prefix LD_LIBRARY_PATH : ${libs}
-      '' + optionalString enableQt ''
-      qtWrapperArgs+=(
-        --prefix LD_LIBRARY_PATH : ${libs}
-      )
-    done
-  '';
+  postInstall =
+    let
+      libs = makeLibraryPath [ vulkan-loader ];
+    in
+    optionalString enableSdl2Frontend ''
+      for binfile in lime3ds lime3ds-room
+      do
+        wrapProgram "$out/bin/$binfile" \
+          --prefix LD_LIBRARY_PATH : ${libs}
+    ''
+    + optionalString enableQt ''
+        qtWrapperArgs+=(
+          --prefix LD_LIBRARY_PATH : ${libs}
+        )
+      done
+    '';
 
-  cmakeFlags = [
-    (cmakeBool "LIME3DS_USE_PRECOMPILED_HEADERS" false)
-    (cmakeBool "USE_SYSTEM_LIBS" true)
-    (cmakeBool "DISABLE_SYSTEM_DYNARMIC" true)
-    (cmakeBool "DISABLE_SYSTEM_GLSLANG" true)
-    (cmakeBool "DISABLE_SYSTEM_LODEPNG" true)
-    (cmakeBool "DISABLE_SYSTEM_VMA" true)
-    (cmakeBool "DISABLE_SYSTEM_XBYAK" true)
-    (cmakeBool "ENABLE_QT" enableQt)
-    (cmakeBool "ENABLE_SDL2_FRONTEND" enableSdl2Frontend)
-    (cmakeBool "ENABLE_CUBEB" enableCubeb)
-    (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence)
-  ] ++ optionals enableQt [
-    (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations)
-  ];
+  cmakeFlags =
+    [
+      (cmakeBool "LIME3DS_USE_PRECOMPILED_HEADERS" false)
+      (cmakeBool "USE_SYSTEM_LIBS" true)
+      (cmakeBool "DISABLE_SYSTEM_DYNARMIC" true)
+      (cmakeBool "DISABLE_SYSTEM_GLSLANG" true)
+      (cmakeBool "DISABLE_SYSTEM_LODEPNG" true)
+      (cmakeBool "DISABLE_SYSTEM_VMA" true)
+      (cmakeBool "DISABLE_SYSTEM_XBYAK" true)
+      (cmakeBool "ENABLE_QT" enableQt)
+      (cmakeBool "ENABLE_SDL2_FRONTEND" enableSdl2Frontend)
+      (cmakeBool "ENABLE_CUBEB" enableCubeb)
+      (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence)
+    ]
+    ++ optionals enableQt [
+      (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations)
+    ];
 
   meta = {
     description = "A Nintendo 3DS emulator based on Citra";