mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use LLVM-based stdenv for Nix build/shell (#5155)

Browse source
This commit is contained in:
Alexandru Ionut Tripon 2026-03-13 21:08:08 +00:00 • committed by GitHub
commit 14da23b06f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

32
flake.nix
View file

@ -86,6 +86,7 @@
let let
pkgs = nixpkgsFor.${system}; pkgs = nixpkgsFor.${system};
llvm = pkgs.llvmPackages_19; llvm = pkgs.llvmPackages_19;
mkShell = pkgs.mkShell.override { inherit (llvm) stdenv; };
packages' = self.packages.${system}; packages' = self.packages.${system};
@ -131,7 +132,7 @@
in in
{ {
default = pkgs.mkShell { default = mkShell {
name = "prism-launcher"; name = "prism-launcher";
inputsFrom = [ packages'.prismlauncher-unwrapped ]; inputsFrom = [ packages'.prismlauncher-unwrapped ];
@ -139,10 +140,11 @@
packages = with pkgs; [ packages = with pkgs; [
ccache ccache
llvm.clang-tools llvm.clang-tools
python3 # Required for `run-clang-tidy`, etc.
]; ];
cmakeBuildType = "Debug"; cmakeBuildType = "Debug";
cmakeFlags = [ "-GNinja" ] ++ packages'.prismlauncher.cmakeFlags; cmakeFlags = [ "-GNinja" ] ++ packages'.prismlauncher-unwrapped.cmakeFlags;
dontFixCmake = true; dontFixCmake = true;
shellHook = '' shellHook = ''
@ -165,16 +167,24 @@
formatter = forAllSystems (system: nixpkgsFor.${system}.nixfmt-rfc-style); formatter = forAllSystems (system: nixpkgsFor.${system}.nixfmt-rfc-style);
overlays.default = final: prev: { overlays.default =
prismlauncher-unwrapped = prev.callPackage ./nix/unwrapped.nix { final: prev:
inherit
libnbtplusplus
self
;
};
prismlauncher = final.callPackage ./nix/wrapper.nix { }; let
}; llvm = final.llvmPackages_19 or prev.llvmPackages_19;
in
{
prismlauncher-unwrapped = prev.callPackage ./nix/unwrapped.nix {
inherit (llvm) stdenv;
inherit
libnbtplusplus
self
;
};
prismlauncher = final.callPackage ./nix/wrapper.nix { };
};
packages = forAllSystems ( packages = forAllSystems (
system: system: