nix: sync changes from nixpkgs

Brings in changes from the Prism Launcher derivation(s) in nixpkgs, notably
from https://github.com/NixOS/nixpkgs/pull/321851 and
https://github.com/NixOS/nixpkgs/pull/303880

Signed-off-by: Evan Goode <mail@evangoo.de>

nix/dev.nix

@@ -19,7 +19,7 @@
         };
       };
 
-      tools.clang-tools = lib.mkForce pkgs.clang-tools_16;
+      tools.clang-tools = lib.mkForce pkgs.clang-tools_18;
     };
 
     devShells.default = pkgs.mkShell {

nix/distribution.nix

@@ -13,8 +13,6 @@
     in {
       inherit
         (ourPackages)
-        fjordlauncher-qt5-unwrapped
-        fjordlauncher-qt5
         fjordlauncher-unwrapped
         fjordlauncher
         ;
@@ -25,37 +23,11 @@
   flake = {
     overlays.default = final: prev: let
       version = builtins.substring 0 8 self.lastModifiedDate or "dirty";
-
+    in {
-      filteredSelf = inputs.nix-filter.lib.filter {
+      fjordlauncher-unwrapped = prev.callPackage ./pkg {
-        root = ../.;
-        include = [
-          "buildconfig"
-          "cmake"
-          "launcher"
-          "libraries"
-          "program_info"
-          "tests"
-          ../COPYING.md
-          ../CMakeLists.txt
-        ];
-      };
-
-      # common args for prismlauncher evaluations
-      unwrappedArgs = {
-        self = filteredSelf;
-
         inherit (inputs) libnbtplusplus;
-        inherit ((final.darwin or prev.darwin).apple_sdk.frameworks) Cocoa;
         inherit version;
       };
-    in {
-      fjordlauncher-qt5-unwrapped = prev.libsForQt5.callPackage ./pkg unwrappedArgs;
-
-      fjordlauncher-qt5 = prev.libsForQt5.callPackage ./pkg/wrapper.nix {
-        fjordlauncher-unwrapped = final.fjordlauncher-qt5-unwrapped;
-      };
-
-      fjordlauncher-unwrapped = prev.qt6Packages.callPackage ./pkg unwrappedArgs;
 
       fjordlauncher = prev.qt6Packages.callPackage ./pkg/wrapper.nix {
         inherit (final) fjordlauncher-unwrapped;

nix/pkg/default.nix

@@ -1,74 +1,105 @@
 {
   lib,
   stdenv,
-  canonicalize-jars-hook,
   cmake,
   cmark,
-  Cocoa,
+  darwin,
-  ninja,
-  jdk17,
-  zlib,
-  qtbase,
-  quazip,
   extra-cmake-modules,
-  tomlplusplus,
-  ghc_filesystem,
   gamemode,
+  ghc_filesystem,
+  jdk17,
+  kdePackages,
+  ninja,
+  stripJavaArchivesHook,
+  tomlplusplus,
+  zlib,
   msaClientID ? null,
   gamemodeSupport ? stdenv.isLinux,
-  self,
   version,
   libnbtplusplus,
 }:
-assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is only available on Linux";
+assert lib.assertMsg (
-  stdenv.mkDerivation rec {
+  gamemodeSupport -> stdenv.isLinux
+) "gamemodeSupport is only available on Linux.";
+  stdenv.mkDerivation {
     pname = "fjordlauncher-unwrapped";
     inherit version;
 
-    src = lib.cleanSource self;
+    src = lib.fileset.toSource {
-
+      root = ../../.;
-    nativeBuildInputs = [extra-cmake-modules cmake jdk17 ninja canonicalize-jars-hook];
+      fileset = lib.fileset.unions (map (fileName: ../../${fileName}) [
-    buildInputs =
+        "buildconfig"
-      [
+        "cmake"
-        qtbase
+        "launcher"
-        zlib
+        "libraries"
-        quazip
+        "program_info"
-        ghc_filesystem
+        "tests"
-        tomlplusplus
+        "COPYING.md"
-        cmark
+        "CMakeLists.txt"
-      ]
+      ]);
-      ++ lib.optional gamemodeSupport gamemode
+    };
-      ++ lib.optionals stdenv.isDarwin [Cocoa];
-
-    hardeningEnable = lib.optionals stdenv.isLinux ["pie"];
-
-    cmakeFlags =
-      [
-        "-DLauncher_BUILD_PLATFORM=nixpkgs"
-      ]
-      ++ lib.optionals (msaClientID != null) ["-DLauncher_MSA_CLIENT_ID=${msaClientID}"]
-      ++ lib.optionals (lib.versionOlder qtbase.version "6") ["-DLauncher_QT_VERSION_MAJOR=5"]
-      ++ lib.optionals stdenv.isDarwin ["-DINSTALL_BUNDLE=nodeps" "-DMACOSX_SPARKLE_UPDATE_FEED_URL=''"];
 
     postUnpack = ''
       rm -rf source/libraries/libnbtplusplus
       ln -s ${libnbtplusplus} source/libraries/libnbtplusplus
     '';
 
+    nativeBuildInputs = [
+      cmake
+      ninja
+      extra-cmake-modules
+      jdk17
+      stripJavaArchivesHook
+    ];
+
+    buildInputs =
+      [
+        cmark
+        ghc_filesystem
+        kdePackages.qtbase
+        kdePackages.qtnetworkauth
+        kdePackages.quazip
+        tomlplusplus
+        zlib
+      ]
+      ++ lib.optionals stdenv.isDarwin [darwin.apple_sdk.frameworks.Cocoa]
+      ++ lib.optional gamemodeSupport gamemode;
+
+    hardeningEnable = lib.optionals stdenv.isLinux ["pie"];
+
+    cmakeFlags =
+      [
+        (lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs")
+      ]
+      ++ lib.optionals (msaClientID != null) [
+        (lib.cmakeFeature "Launcher_MSA_CLIENT_ID" (toString msaClientID))
+      ]
+      ++ lib.optionals (lib.versionOlder kdePackages.qtbase.version "6") [
+        (lib.cmakeFeature "Launcher_QT_VERSION_MAJOR" "5")
+      ]
+      ++ lib.optionals stdenv.isDarwin [
+        # we wrap our binary manually
+        (lib.cmakeFeature "INSTALL_BUNDLE" "nodeps")
+        # disable built-in updater
+        (lib.cmakeFeature "MACOSX_SPARKLE_UPDATE_FEED_URL" "''")
+        (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/Applications/")
+      ];
+
     dontWrapQtApps = true;
 
-    meta = with lib; {
+    meta = {
-      mainProgram = "fjordlauncher";
+      description = "Prism Launcher fork with support for alternative auth servers";
-      homepage = "https://github.com/unmojang/FjordLauncher/";
-      description = "A free, open source launcher for Minecraft";
       longDescription = ''
         Allows you to have multiple, separate instances of Minecraft (each with
         their own mods, texture packs, saves, etc) and helps you manage them and
         their associated options with a simple interface.
       '';
-      platforms = with platforms; linux ++ darwin;
+      homepage = "https://fjordlauncher.org/";
-      changelog = "https://github.com/unmojang/FjordLauncher/releases/tag/${version}";
+      license = lib.licenses.gpl3Only;
-      license = licenses.gpl3Only;
+      maintainers = with lib.maintainers; [
-      maintainers = with maintainers; [evan-goode];
+        evan-goode
+      ];
+      mainProgram = "fjordlauncher";
+      platforms = lib.platforms.linux ++ lib.platforms.darwin;
     };
   }

nix/pkg/wrapper.nix

@@ -3,94 +3,143 @@
   stdenv,
   symlinkJoin,
   fjordlauncher-unwrapped,
-  wrapQtAppsHook,
   addOpenGLRunpath,
-  qtbase, # needed for wrapQtAppsHook
+  flite,
-  qtsvg,
+  gamemode,
-  qtwayland,
-  xorg,
-  libpulseaudio,
-  libGL,
   glfw,
-  openal,
+  glfw-wayland-minecraft,
+  glxinfo,
   jdk8,
   jdk17,
   jdk21,
-  gamemode,
+  kdePackages,
-  flite,
+  libGL,
-  mesa-demos,
+  libpulseaudio,
-  udev,
   libusb1,
-  msaClientID ? null,
+  makeWrapper,
-  gamemodeSupport ? stdenv.isLinux,
+  openal,
-  textToSpeechSupport ? stdenv.isLinux,
+  pciutils,
-  controllerSupport ? stdenv.isLinux,
+  udev,
-  jdks ? [jdk21 jdk17 jdk8],
+  vulkan-loader,
+  xorg,
   additionalLibs ? [],
   additionalPrograms ? [],
-}: let
+  controllerSupport ? stdenv.isLinux,
-  fjordlauncherFinal = fjordlauncher-unwrapped.override {
+  gamemodeSupport ? stdenv.isLinux,
-    inherit msaClientID gamemodeSupport;
+  jdks ? [
-  };
+    jdk21
+    jdk17
+    jdk8
+  ],
+  msaClientID ? null,
+  textToSpeechSupport ? stdenv.isLinux,
+  # Adds `glfw-wayland-minecraft` to `LD_LIBRARY_PATH`
+  # when launched on wayland, allowing for the game to be run natively.
+  # Make sure to enable "Use system installation of GLFW" in instance settings
+  # for this to take effect
+  #
+  # Warning: This build of glfw may be unstable, and the launcher
+  # itself can take slightly longer to start
+  withWaylandGLFW ? false,
+}:
+assert lib.assertMsg (
+  controllerSupport -> stdenv.isLinux
+) "controllerSupport only has an effect on Linux.";
+assert lib.assertMsg (
+  textToSpeechSupport -> stdenv.isLinux
+) "textToSpeechSupport only has an effect on Linux.";
+assert lib.assertMsg (
+  withWaylandGLFW -> stdenv.isLinux
+) "withWaylandGLFW is only available on Linux."; let
+  fjordlauncher' = fjordlauncher-unwrapped.override {inherit msaClientID gamemodeSupport;};
 in
   symlinkJoin {
-    name = "fjordlauncher-${fjordlauncherFinal.version}";
+    name = "fjordlauncher-${fjordlauncher'.version}";
 
-    paths = [fjordlauncherFinal];
+    paths = [fjordlauncher'];
 
-    nativeBuildInputs = [
+    nativeBuildInputs =
-      wrapQtAppsHook
+      [kdePackages.wrapQtAppsHook]
-    ];
+      # purposefully using a shell wrapper here for variable expansion
+      # see https://github.com/NixOS/nixpkgs/issues/172583
+      ++ lib.optional withWaylandGLFW makeWrapper;
 
     buildInputs =
       [
-        qtbase
+        kdePackages.qtbase
-        qtsvg
+        kdePackages.qtsvg
       ]
-      ++ lib.optional (lib.versionAtLeast qtbase.version "6" && stdenv.isLinux) qtwayland;
+      ++ lib.optional (
+        lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.isLinux
+      )
+      kdePackages.qtwayland;
 
-    postBuild = ''
+    env = {
+      waylandPreExec = lib.optionalString withWaylandGLFW ''
+        if [ -n "$WAYLAND_DISPLAY" ]; then
+          export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH"
+        fi
+      '';
+    };
+
+    postBuild =
+      lib.optionalString withWaylandGLFW ''
+        qtWrapperArgs+=(--run "$waylandPreExec")
+      ''
+      + ''
         wrapQtAppsHook
       '';
 
     qtWrapperArgs = let
       runtimeLibs =
-        (with xorg; [
+        [
-          libX11
-          libXext
-          libXcursor
-          libXrandr
-          libXxf86vm
-        ])
-        ++ [
           # lwjgl
+          glfw
           libpulseaudio
           libGL
-          glfw
           openal
           stdenv.cc.cc.lib
 
-          # oshi
+          vulkan-loader # VulkanMod's lwjgl
-          udev
+
+          udev # oshi
+
+          xorg.libX11
+          xorg.libXext
+          xorg.libXcursor
+          xorg.libXrandr
+          xorg.libXxf86vm
         ]
-        ++ lib.optional gamemodeSupport gamemode.lib
         ++ lib.optional textToSpeechSupport flite
+        ++ lib.optional gamemodeSupport gamemode.lib
         ++ lib.optional controllerSupport libusb1
         ++ additionalLibs;
 
       runtimePrograms =
         [
-          xorg.xrandr
+          glxinfo
-          mesa-demos # need glxinfo
+          pciutils # need lspci
+          xorg.xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
         ]
         ++ additionalPrograms;
     in
-      ["--prefix FJORDLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"]
+      ["--prefix fjordLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"]
       ++ lib.optionals stdenv.isLinux [
         "--set LD_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}"
-        # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
         "--prefix PATH : ${lib.makeBinPath runtimePrograms}"
       ];
 
-    inherit (fjordlauncherFinal) meta;
+    meta = {
+      inherit
+        (fjordlauncher'.meta)
+        description
+        longDescription
+        homepage
+        changelog
+        license
+        maintainers
+        mainProgram
+        platforms
+        ;
+    };
   }