style(nix): format with modern nixfmt
Signed-off-by: Seth Flynn <getchoo@tuta.io>
This commit is contained in:
+2
-4
@@ -76,8 +76,7 @@ stdenv.mkDerivation {
|
|||||||
stripJavaArchivesHook
|
stripJavaArchivesHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs = [
|
||||||
[
|
|
||||||
cmark
|
cmark
|
||||||
kdePackages.qtbase
|
kdePackages.qtbase
|
||||||
kdePackages.qtnetworkauth
|
kdePackages.qtnetworkauth
|
||||||
@@ -90,8 +89,7 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ];
|
hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ];
|
||||||
|
|
||||||
cmakeFlags =
|
cmakeFlags = [
|
||||||
[
|
|
||||||
# downstream branding
|
# downstream branding
|
||||||
(lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs")
|
(lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs")
|
||||||
]
|
]
|
||||||
|
|||||||
+4
-5
@@ -61,8 +61,7 @@ symlinkJoin {
|
|||||||
|
|
||||||
nativeBuildInputs = [ kdePackages.wrapQtAppsHook ];
|
nativeBuildInputs = [ kdePackages.wrapQtAppsHook ];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs = [
|
||||||
[
|
|
||||||
kdePackages.qtbase
|
kdePackages.qtbase
|
||||||
kdePackages.qtsvg
|
kdePackages.qtsvg
|
||||||
]
|
]
|
||||||
@@ -76,8 +75,7 @@ symlinkJoin {
|
|||||||
|
|
||||||
qtWrapperArgs =
|
qtWrapperArgs =
|
||||||
let
|
let
|
||||||
runtimeLibs =
|
runtimeLibs = [
|
||||||
[
|
|
||||||
(lib.getLib stdenv.cc.cc)
|
(lib.getLib stdenv.cc.cc)
|
||||||
## native versions
|
## native versions
|
||||||
glfw3-minecraft
|
glfw3-minecraft
|
||||||
@@ -110,7 +108,8 @@ symlinkJoin {
|
|||||||
mesa-demos
|
mesa-demos
|
||||||
pciutils # need lspci
|
pciutils # need lspci
|
||||||
xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
|
xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
|
||||||
] ++ additionalPrograms;
|
]
|
||||||
|
++ additionalPrograms;
|
||||||
|
|
||||||
in
|
in
|
||||||
[ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ]
|
[ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ]
|
||||||
|
|||||||
Reference in New Issue
Block a user