From 988885d0b6e09be37b15f4e7ec883f48b95a2286 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Mon, 14 Sep 2026 21:39:47 +0300 Subject: [PATCH] niri: Patch /etc/shells to /usr/share/defaults/shells Makes the niri-session check work. --- n/niri/manifest.x86_64.bin | Bin 592 -> 589 bytes n/niri/manifest.x86_64.jsonc | 2 +- n/niri/pkg/stateless.patch | 19 +++++++++++++++++++ n/niri/stone.yaml | 4 +++- 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 n/niri/pkg/stateless.patch diff --git a/n/niri/manifest.x86_64.bin b/n/niri/manifest.x86_64.bin index 17600aa7228f492098a3e90ff8e63241259b0e61..3c9e20b2f5b3f43993979a99e8fa198079871ca8 100644 GIT binary patch delta 561 zcmV-10?z%=1kD7HCw~n90000000gX=QDMgSJBF12001rk0RaLiwJ-f(tOFeo0A|=v zAHZHWv?Lv-^=2OPd!Ip5Fx!8PG|{QihQV4uxkTg?L;yzsNB|mV-0RJt&3T_8?@Z4T zesk`Q`8Laa>df6qeo-Ah@#?w3S4OcBDSa;Rh6Usgi9h`Ri+?=c2=tub3;+N4#QHhF z6aGIqerz?R=Yi;~ z?Fo3M7;2xi9 zJGM5_ipY-m|Cga)ip@%jjuIRLk9g>fIlsIz3ZLMG= zdFnl}?V32#1!AZ%RfI@LhNPTS4v<8G!kPzRD31}TCVwCb3KojxD=12g$gl)u;bam$ zlG>=3Bx6M?4o8gKkc4zt@-hx4G+~s`s@zlQ9mH0}a1^4!Gk%O7%UdlqA~v)V;r^ha z=S%4IOQs|&T^Fq38Hcb218}zSiu8q8^ji*UIs3O11Z-K70070}C8mggU)UoPg4$PO zi0z`IuqrhQ#?cR6fmHDR{lC9HeT$_&vkNr*F;xjU!9bi#7E$59^aI$~^(~4%SA+B`rk2*TCLkr5k-N&hI>oEey;7mo+}9RwxZFoP1J407w8y03%XHdv=C$ zT5-;LFDz;NRbFvxZd~nFHzZrLh9!s8w?F;{4)H1ZV03>0w|^8U{F3?Q|2@_8;rt0a z`v1O7{{UY39}{AevU*Y%bCiJ0J*UhOLr}+%(Y_(6LAh0$MaNuz@c-4+fgT_oe+0i! zAyUL6l2DVyo#f6aDg)b`PyV7)SYEj#jK&#?0k$Wk4XhcBHey@IoTUwsFNtDRiK?17 zP=iaZYqMEdLx0DFHVnmSabpwpc6|6;01N-GWjJHL)j|wrSa;1YEI3oeljj3r$I%YY z{J(`0EkTs{C2U~K9YI+1Xc_bWCY;r^g&KyiSy{j_3A8rG5<`RNnfHj+ZL621brC5N zLJpW@iYY2?j##1KCtvP}DmoxInfm#9{zck^^MLh|^L~{14`k z3}D!+?JaRud1&Z>D<8aq(s`SAd-U4qNiAj1U8pVXR^{#FEpaMXMFoEO2h@b5Ew>6p CHuy#W diff --git a/n/niri/manifest.x86_64.jsonc b/n/niri/manifest.x86_64.jsonc index d068f95560..685c0e16ae 100644 --- a/n/niri/manifest.x86_64.jsonc +++ b/n/niri/manifest.x86_64.jsonc @@ -62,6 +62,6 @@ } }, "source-name": "niri", - "source-release": "18", + "source-release": "19", "source-version": "26.04" } diff --git a/n/niri/pkg/stateless.patch b/n/niri/pkg/stateless.patch new file mode 100644 index 0000000000..412923b7fa --- /dev/null +++ b/n/niri/pkg/stateless.patch @@ -0,0 +1,19 @@ +commit ca37ae833a15378bce3ff26a463406e053c6715f +Author: Ivan Molodetskikh +Date: Mon Sep 14 21:19:09 2026 +0300 + + niri-session: Change /etc/shells to /usr/share/defaults/shells + +diff --git a/resources/niri-session b/resources/niri-session +index a9a4d9409..451eaa939 100755 +--- a/resources/niri-session ++++ b/resources/niri-session +@@ -11,7 +11,7 @@ if [ -n "${MANAGERPID:-}" ] && [ "${SYSTEMD_EXEC_PID:-}" = "$$" ]; then + fi + + if [ -n "$SHELL" ] && +- grep -q "$SHELL" /etc/shells && ++ grep -q "$SHELL" /usr/share/defaults/shells && + ! (echo "$SHELL" | grep -q "false") && + ! (echo "$SHELL" | grep -q "nologin"); then + if [ "$1" != '-l' ]; then diff --git a/n/niri/stone.yaml b/n/niri/stone.yaml index 67b770c072..ca6aed8360 100644 --- a/n/niri/stone.yaml +++ b/n/niri/stone.yaml @@ -3,7 +3,7 @@ name : niri version : "26.04" -release : 18 +release : 19 summary : Niri Desktop Compositor license : GPL-3.0 homepage : https://github.com/YaLTeR/niri @@ -37,6 +37,8 @@ rundeps : - xdg-desktop-portal-gnome - xdg-desktop-portal-gtk setup : | + %patch %(pkgdir)/stateless.patch + mkdir .cargo # To update this you will probably need to update the Smithay ref below. This was generated by using `cargo vendor > .cargo/config.toml`