chore(nix): format code using alejandra
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
parent
e0e26a37b5
commit
9dff1bac83
25
flake.nix
25
flake.nix
@ -3,12 +3,22 @@
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||
flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
|
||||
libnbtplusplus = { url = "github:PrismLauncher/libnbtplusplus"; flake = false; };
|
||||
flake-compat = {
|
||||
url = "github:edolstra/flake-compat";
|
||||
flake = false;
|
||||
};
|
||||
libnbtplusplus = {
|
||||
url = "github:PrismLauncher/libnbtplusplus";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, libnbtplusplus, ... }:
|
||||
let
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
libnbtplusplus,
|
||||
...
|
||||
}: let
|
||||
# User-friendly version number.
|
||||
version = builtins.substring 0 8 self.lastModifiedDate;
|
||||
|
||||
@ -25,10 +35,11 @@
|
||||
prismlauncher-qt5 = pkgs.libsForQt5.callPackage ./nix {inherit version self libnbtplusplus;};
|
||||
prismlauncher = pkgs.qt6Packages.callPackage ./nix {inherit version self libnbtplusplus;};
|
||||
};
|
||||
in {
|
||||
packages = forAllSystems (
|
||||
system: let
|
||||
packages = packagesFn pkgs.${system};
|
||||
in
|
||||
{
|
||||
packages = forAllSystems (system:
|
||||
let packages = packagesFn pkgs.${system}; in
|
||||
packages // {default = packages.prismlauncher;}
|
||||
);
|
||||
|
||||
|
@ -1,33 +1,32 @@
|
||||
{ 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;
|
||||
@ -35,7 +34,8 @@ stdenv.mkDerivation rec {
|
||||
src = lib.cleanSource self;
|
||||
|
||||
nativeBuildInputs = [extra-cmake-modules cmake file jdk17 wrapQtAppsHook];
|
||||
buildInputs = [
|
||||
buildInputs =
|
||||
[
|
||||
qtbase
|
||||
qtsvg
|
||||
zlib
|
||||
@ -43,9 +43,11 @@ stdenv.mkDerivation rec {
|
||||
ghc_filesystem
|
||||
tomlplusplus
|
||||
cmark
|
||||
] ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland;
|
||||
]
|
||||
++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland;
|
||||
|
||||
cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]
|
||||
cmakeFlags =
|
||||
lib.optionals (msaClientID != "") ["-DLauncher_MSA_CLIENT_ID=${msaClientID}"]
|
||||
++ lib.optionals (lib.versionOlder qtbase.version "6") ["-DLauncher_QT_VERSION_MAJOR=5"];
|
||||
dontWrapQtApps = true;
|
||||
|
||||
@ -57,8 +59,7 @@ stdenv.mkDerivation rec {
|
||||
chown -R $USER: source/libraries/libnbtplusplus
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
let
|
||||
postInstall = let
|
||||
libpath = with xorg;
|
||||
lib.makeLibraryPath [
|
||||
libX11
|
||||
@ -72,8 +73,7 @@ stdenv.mkDerivation rec {
|
||||
openal
|
||||
stdenv.cc.cc.lib
|
||||
];
|
||||
in
|
||||
''
|
||||
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} \
|
||||
@ -81,7 +81,6 @@ stdenv.mkDerivation rec {
|
||||
--prefix PATH : ${lib.makeBinPath [xorg.xrandr]}
|
||||
'';
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://prismlauncher.org/";
|
||||
description = "A free, open source launcher for Minecraft";
|
||||
|
Loading…
Reference in New Issue
Block a user