From a8ffdeca2b1592bc13f11ab4203b94bf6d8ae1d2 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 8 Mar 2023 11:03:50 +0100
Subject: chore!: switch to Qt 6 by default

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nix')

diff --git a/nix/default.nix b/nix/default.nix
index f6ab1332..99bb2231 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland;
 
   cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]
-    ++ lib.optionals (lib.versionAtLeast qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=6" ];
+    ++ lib.optionals (lib.versionOlder qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=5" ];
   dontWrapQtApps = true;
 
   postUnpack = ''
-- 
cgit 


From 9dff1bac838b5a827b1e323bdc983b0f7d1e61bd Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 14 Mar 2023 10:48:19 +0100
Subject: chore(nix): format code using alejandra

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 nix/default.nix      | 129 +++++++++++++++++++++++++--------------------------
 nix/flake-compat.nix |   2 +-
 2 files changed, 65 insertions(+), 66 deletions(-)

(limited to 'nix')

diff --git a/nix/default.nix b/nix/default.nix
index 99bb2231..6d4f3f24 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -1,52 +1,54 @@
-{ lib
-, stdenv
-, cmake
-, jdk8
-, jdk17
-, zlib
-, file
-, wrapQtAppsHook
-, xorg
-, libpulseaudio
-, qtbase
-, qtsvg
-, qtwayland
-, libGL
-, quazip
-, glfw
-, openal
-, extra-cmake-modules
-, tomlplusplus
-, ghc_filesystem
-, cmark
-, msaClientID ? ""
-, jdks ? [ jdk17 jdk8 ]
-
+{
+  lib,
+  stdenv,
+  cmake,
+  jdk8,
+  jdk17,
+  zlib,
+  file,
+  wrapQtAppsHook,
+  xorg,
+  libpulseaudio,
+  qtbase,
+  qtsvg,
+  qtwayland,
+  libGL,
+  quazip,
+  glfw,
+  openal,
+  extra-cmake-modules,
+  tomlplusplus,
+  ghc_filesystem,
+  cmark,
+  msaClientID ? "",
+  jdks ? [jdk17 jdk8],
   # flake
-, self
-, version
-, libnbtplusplus
+  self,
+  version,
+  libnbtplusplus,
 }:
-
 stdenv.mkDerivation rec {
   pname = "prismlauncher";
   inherit version;
 
   src = lib.cleanSource self;
 
-  nativeBuildInputs = [ extra-cmake-modules cmake file jdk17 wrapQtAppsHook ];
-  buildInputs = [
-    qtbase
-    qtsvg
-    zlib
-    quazip
-    ghc_filesystem
-    tomlplusplus
-    cmark
-  ] ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland;
+  nativeBuildInputs = [extra-cmake-modules cmake file jdk17 wrapQtAppsHook];
+  buildInputs =
+    [
+      qtbase
+      qtsvg
+      zlib
+      quazip
+      ghc_filesystem
+      tomlplusplus
+      cmark
+    ]
+    ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland;
 
-  cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]
-    ++ lib.optionals (lib.versionOlder qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=5" ];
+  cmakeFlags =
+    lib.optionals (msaClientID != "") ["-DLauncher_MSA_CLIENT_ID=${msaClientID}"]
+    ++ lib.optionals (lib.versionOlder qtbase.version "6") ["-DLauncher_QT_VERSION_MAJOR=5"];
   dontWrapQtApps = true;
 
   postUnpack = ''
@@ -57,30 +59,27 @@ stdenv.mkDerivation rec {
     chown -R $USER: source/libraries/libnbtplusplus
   '';
 
-  postInstall =
-    let
-      libpath = with xorg;
-        lib.makeLibraryPath [
-          libX11
-          libXext
-          libXcursor
-          libXrandr
-          libXxf86vm
-          libpulseaudio
-          libGL
-          glfw
-          openal
-          stdenv.cc.cc.lib
-        ];
-    in
-    ''
-      # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
-      wrapQtApp $out/bin/prismlauncher \
-        --set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \
-        --prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks} \
-        --prefix PATH : ${lib.makeBinPath [xorg.xrandr]}
-    '';
-
+  postInstall = let
+    libpath = with xorg;
+      lib.makeLibraryPath [
+        libX11
+        libXext
+        libXcursor
+        libXrandr
+        libXxf86vm
+        libpulseaudio
+        libGL
+        glfw
+        openal
+        stdenv.cc.cc.lib
+      ];
+  in ''
+    # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
+    wrapQtApp $out/bin/prismlauncher \
+      --set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \
+      --prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks} \
+      --prefix PATH : ${lib.makeBinPath [xorg.xrandr]}
+  '';
 
   meta = with lib; {
     homepage = "https://prismlauncher.org/";
@@ -93,6 +92,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${version}";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ minion3665 Scrumplex ];
+    maintainers = with maintainers; [minion3665 Scrumplex];
   };
 }
diff --git a/nix/flake-compat.nix b/nix/flake-compat.nix
index 8b6cb99c..7162a6cf 100644
--- a/nix/flake-compat.nix
+++ b/nix/flake-compat.nix
@@ -6,4 +6,4 @@ let
     sha256 = narHash;
   };
 in
-import flake-compat { src = ../.; }
+  import flake-compat {src = ../.;}
-- 
cgit