Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

niri: 25.01 -> 25.02 BACKPORT 24.11 #384710

Closed
wants to merge 1 commit into from
+14 −12
Closed

niri: 25.01 -> 25.02 BACKPORT 24.11 #384710

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions pkgs/by-name/ni/niri/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
libglvnd,
libinput,
libxkbcommon,
mesa,
libgbm,
versionCheckHook,
nix-update-script,
pango,
pipewire,
Expand All @@ -22,15 +23,15 @@
withSystemd ? true,
}:

rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "niri";
version = "25.01";
version = "25.02";

src = fetchFromGitHub {
owner = "YaLTeR";
repo = "niri";
tag = "v${version}";
hash = "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=";
tag = "v${finalAttrs.version}";
hash = "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=";
};

postPatch = ''
Expand All @@ -40,7 +41,7 @@ rustPlatform.buildRustPackage rec {
'';

useFetchCargoVendor = true;
cargoHash = "sha256-eGI3i7FnjZGEfcGvEpNLOog8cgExBJuGoXM/oHsui0M=";
cargoHash = "sha256-xUjBQ65INi5qD7s5SpPw9TISgY6I3bjjUBmpubvM43I=";

strictDeps = true;

Expand All @@ -55,7 +56,7 @@ rustPlatform.buildRustPackage rec {
libglvnd # For libEGL
libinput
libxkbcommon
mesa # For libgbm
libgbm
pango
seatd
wayland # For libwayland-client
Expand Down Expand Up @@ -103,11 +104,12 @@ rustPlatform.buildRustPackage rec {
};

preCheck = ''
export XDG_RUNTIME_DIR=$(mktemp -d)
# See https://github.com/YaLTeR/niri/issues/953
export RAYON_NUM_THREADS=1
'';

nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
doInstallCheck = true;

passthru = {
providedSessions = [ "niri" ];
updateScript = nix-update-script { };
Expand All @@ -116,7 +118,7 @@ rustPlatform.buildRustPackage rec {
meta = {
description = "Scrollable-tiling Wayland compositor";
homepage = "https://github.com/YaLTeR/niri";
changelog = "https://github.com/YaLTeR/niri/releases/tag/v${version}";
changelog = "https://github.com/YaLTeR/niri/releases/tag/v${finalAttrs.version}";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [
iogamaster
Expand All @@ -127,4 +129,4 @@ rustPlatform.buildRustPackage rec {
mainProgram = "niri";
platforms = lib.platforms.linux;
};
}
})
Loading