adjust missed fjords to shattered in hopes of fixing builds

This commit is contained in:
Luna 2024-10-29 03:48:04 -05:00
parent a03b3d8c7a
commit 02a60f97c3
4 changed files with 22 additions and 22 deletions

View File

@ -23,8 +23,8 @@
```
{
inputs.fjordlauncher = {
url = "github:unmojang/FjordLauncher";
inputs.shatteredprism = {
url = "github:lunaislazier/ShatteredPrism";
inputs = {
flake-compat.follows = "";
};
@ -74,7 +74,7 @@
in
{
default = pkgs.mkShell {
inputsFrom = [ self.packages.${system}.fjordlauncher-unwrapped ];
inputsFrom = [ self.packages.${system}.shatteredprism-unwrapped ];
buildInputs = with pkgs; [
ccache
ninja
@ -91,7 +91,7 @@
version = builtins.substring 0 8 self.lastModifiedDate or "dirty";
in
{
fjordlauncher-unwrapped = prev.callPackage ./nix/unwrapped.nix {
shatteredprism-unwrapped = prev.callPackage ./nix/unwrapped.nix {
inherit
libnbtplusplus
nix-filter
@ -100,7 +100,7 @@
;
};
fjordlauncher = final.callPackage ./nix/wrapper.nix { };
shatteredprism = final.callPackage ./nix/wrapper.nix { };
};
packages = forAllSystems (
@ -109,12 +109,12 @@
pkgs = nixpkgsFor.${system};
# Build a scope from our overlay
fjordPackages = lib.makeScope pkgs.newScope (final: self.overlays.default final pkgs);
shatteredPackages = lib.makeScope pkgs.newScope (final: self.overlays.default final pkgs);
# Grab our packages from it and set the default
packages = {
inherit (fjordPackages) fjordlauncher-unwrapped fjordlauncher;
default = fjordPackages.fjordlauncher;
inherit (shatteredPackages) shatteredprism-unwrapped shatteredprism;
default = shatteredPackages.shatteredprism;
};
in
# Only output them if they're available on the current system
@ -125,15 +125,15 @@
legacyPackages = forAllSystems (
system:
let
fjordPackages = self.packages.${system};
shatteredPackages = self.packages.${system};
legacyPackages = self.legacyPackages.${system};
in
{
fjordlauncher-debug = fjordPackages.fjordlauncher.override {
fjordlauncher-unwrapped = legacyPackages.fjordlauncher-unwrapped-debug;
shatteredprism-debug = shatteredPackages.shatteredprism.override {
shatteredprism-unwrapped = legacyPackages.shatteredprism-unwrapped-debug;
};
fjordlauncher-unwrapped-debug = fjordPackages.fjordlauncher-unwrapped.overrideAttrs {
shatteredprism-unwrapped-debug = shatteredPackages.shatteredprism-unwrapped.overrideAttrs {
cmakeBuildType = "Debug";
dontStrip = true;
};

View File

@ -72,7 +72,7 @@ int main(int argc, char* argv[])
Q_INIT_RESOURCE(multimc);
Q_INIT_RESOURCE(backgrounds);
Q_INIT_RESOURCE(documents);
Q_INIT_RESOURCE(fjordlauncher);
Q_INIT_RESOURCE(shatteredprism);
Q_INIT_RESOURCE(pe_dark);
Q_INIT_RESOURCE(pe_light);

View File

@ -24,7 +24,7 @@ assert lib.assertMsg (
gamemodeSupport -> stdenv.isLinux
) "gamemodeSupport is only available on Linux.";
stdenv.mkDerivation {
pname = "fjordlauncher-unwrapped";
pname = "shatteredprism-unwrapped";
inherit version;
src = nix-filter.lib {
@ -96,12 +96,12 @@ stdenv.mkDerivation {
their own mods, texture packs, saves, etc) and helps you manage them and
their associated options with a simple interface.
'';
homepage = "https://github.com/unmojang/FjordLauncher";
homepage = "https://github.com/lunaislazier/ShatteredPrism";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [
evan-goode
];
mainProgram = "fjordlauncher";
mainProgram = "shatteredprism";
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}

View File

@ -2,7 +2,7 @@
lib,
stdenv,
symlinkJoin,
fjordlauncher-unwrapped,
shatteredprism-unwrapped,
addOpenGLRunpath,
flite,
gamemode,
@ -52,12 +52,12 @@ assert lib.assertMsg (
withWaylandGLFW -> stdenv.isLinux
) "withWaylandGLFW is only available on Linux.";
let
fjordlauncher' = fjordlauncher-unwrapped.override { inherit msaClientID gamemodeSupport; };
shatteredprism' = shatteredprism-unwrapped.override { inherit msaClientID gamemodeSupport; };
in
symlinkJoin {
name = "fjordlauncher-${fjordlauncher'.version}";
name = "shatteredprism-${shatteredprism'.version}";
paths = [ fjordlauncher' ];
paths = [ shatteredprism' ];
nativeBuildInputs =
[
@ -125,7 +125,7 @@ symlinkJoin {
] ++ additionalPrograms;
in
[
"--prefix FJORDLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"
"--prefix SHATTEREDPRISM_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"
]
++ lib.optionals stdenv.isLinux [
"--set LD_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}"
@ -133,7 +133,7 @@ symlinkJoin {
];
meta = {
inherit (fjordlauncher'.meta)
inherit (shatteredprism'.meta)
description
longDescription
homepage