!UNVBThoJtlIiVwiDjU:nixos.org

Staging

323 Members
Staging merges | Running staging cycles: https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+head%3Astaging-next+head%3Astaging-next-25.05 | Review Reports: https://malob.github.io/nix-review-tools-reports/110 Servers

Load older messages

SenderMessageTime
19 Dec 2025
@ghpzin:envs.netghpzin I tried reordering these buildInputs like here on master:
https://github.com/NixOS/nixpkgs/blob/c30b80416b233c3673e573c0821bf96cc83818db/pkgs/servers/x11/xorg/overrides.nix#L452-L457
ie this diff on staging-next:
--- a/pkgs/by-name/xo/xorg-server/package.nix
+++ b/pkgs/by-name/xo/xorg-server/package.nix
@@ -139,10 +139,10 @@
     xtrans
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    dri-pkgconfig-stub
     libdrm
     libgbm
     mesa-gl-headers
+    dri-pkgconfig-stub
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     autoconf
but it did not help.
That refactor moved xorg-server into separate by-name so tracking what went where is quite hard. 		20:42:35
@ghpzin:envs.netghpzin I tried reordering these buildInputs like here on master:
https://github.com/NixOS/nixpkgs/blob/c30b80416b233c3673e573c0821bf96cc83818db/pkgs/servers/x11/xorg/overrides.nix#L452-L457
ie this diff on staging-next:
--- a/pkgs/by-name/xo/xorg-server/package.nix
+++ b/pkgs/by-name/xo/xorg-server/package.nix
@@ -139,10 +139,10 @@
     xtrans
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    dri-pkgconfig-stub
     libdrm
     libgbm
     mesa-gl-headers
+    dri-pkgconfig-stub
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     autoconf
but it did not help.
That refactor from staging moved xorg-server into separate by-name so tracking what went where is quite hard. 		20:44:06
@ghpzin:envs.netghpzin I tried reordering these buildInputs like here on master:
https://github.com/NixOS/nixpkgs/blob/c30b80416b233c3673e573c0821bf96cc83818db/pkgs/servers/x11/xorg/overrides.nix#L452-L457
ie this diff on staging-next:
--- a/pkgs/by-name/xo/xorg-server/package.nix
+++ b/pkgs/by-name/xo/xorg-server/package.nix
@@ -139,10 +139,10 @@
     xtrans
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    dri-pkgconfig-stub
     libdrm
     libgbm
     mesa-gl-headers
+    dri-pkgconfig-stub
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     autoconf
but it did not help.
That refactor from staging moved xorg-server into separate by-name so tracking what went where is quite hard.
It is quite suspicious that upstream did something with glamor in 21.1.20 that broke other things, and now we get problems related to it too.
Maybe somewhere on staging between refactors somebody did something related to that update, but I could not find it so far. 		20:46:11
@fabianhjr:matrix.orgFabián Herediahttps://github.com/NixOS/nixpkgs/pull/472445 Fixes dee in staging-next (dependency of libunity <- Discord)22:36:32
@fabianhjr:matrix.orgFabián Heredia * https://github.com/NixOS/nixpkgs/pull/472445 Fixes dee in staging-next (dependency of libunity <- Discord) due to gcc15 breakage 22:36:48
@fabianhjr:matrix.orgFabián Heredia 
error: Cannot build '/nix/store/w2vcan2incrnad11ysbj6xj4w509mf8v-dee-unstable-2017-06-16.drv'.
       Reason: builder failed with exit code 2.
       Output paths:
         /nix/store/3ajwi6lggwj7pjzv6gyx0g095x4sidhp-dee-unstable-2017-06-16
         /nix/store/7is6xw5sxqydjbfrph3c9ix5mg2rg4nj-dee-unstable-2017-06-16-dev
         /nix/store/jvxyifr4yqqgpi5vgc0dc315kvdj5s4n-dee-unstable-2017-06-16-py
       Last 25 log lines:
       >       |   ^~~~~~~~
       > In file included from /nix/store/j359ndglk11v5j47ra66lc1vxlk2dbjw-glib-2.86.3-dev/include/glib-2.0/glib.h:92:
       > /nix/store/j359ndglk11v5j47ra66lc1vxlk2dbjw-glib-2.86.3-dev/include/glib-2.0/glib/gtimer.h:75:10: note: declared here
       >    75 | gchar*   g_time_val_to_iso8601   (GTimeVal    *time_) G_GNUC_MALLOC;
       >       |          ^~~~~~~~~~~~~~~~~~~~~
       > dee-tool.c: In function 'dump_peer':
       > dee-tool.c:242:31: error: passing argument 2 of 'g_timeout_add_seconds' from incompatible pointer type [-Wincompatible-pointer-types]
       >   242 |     g_timeout_add_seconds (1, _timeout_cb, NULL);
       >       |                               ^~~~~~~~~~~
       >       |                               |
       >       |                               gboolean (*)(void) {aka int (*)(void)}
       > /nix/store/j359ndglk11v5j47ra66lc1vxlk2dbjw-glib-2.86.3-dev/include/glib-2.0/glib/gmain.h:949:54: note: expected 'GSourceFunc' {aka 'int (*)(void *)'} but argument is of type 'gboolean (*)(void)' {aka 'int (*)(void)'}
       >   949 |                                      GSourceFunc     function,
       >       |                                      ~~~~~~~~~~~~~~~~^~~~~~~~
       > dee-tool.c:207:1: note: '_timeout_cb' declared here
       >   207 | _timeout_cb ()
       >       | ^~~~~~~~~~~
       > /nix/store/j359ndglk11v5j47ra66lc1vxlk2dbjw-glib-2.86.3-dev/include/glib-2.0/glib/gmain.h:200:20: note: 'GSourceFunc' declared here
       >   200 | typedef gboolean (*GSourceFunc)       (gpointer user_data);
       >       |                    ^~~~~~~~~~~
       > make[2]: *** [Makefile:468: dee-tool.o] Error 1
       > make[2]: Leaving directory '/build/dee/tools'
       > make[1]: *** [Makefile:533: all-recursive] Error 1
       > make[1]: Leaving directory '/build/dee'
       > make: *** [Makefile:439: all] Error 2
       For full logs, run:
         nix log /nix/store/w2vcan2incrnad11ysbj6xj4w509mf8v-dee-unstable-2017-06-16.drv
error: Cannot build '/nix/store/gf57xfm523vm35j0xxr001fald6w6jr4-libunity-unstable-2021-02-01.drv'.
       Reason: 1 dependency failed.
       Output paths:
         /nix/store/isx9q4c8dpbippw32vpjzgymxsw9yz2m-libunity-unstable-2021-02-01
         /nix/store/vswssrm09dz6djws6a69hzmnj4spapcg-libunity-unstable-2021-02-01-dev
         /nix/store/y706fvighhg56gmmwyr8ja5cvqjbhcs1-libunity-unstable-2021-02-01-py
error: Cannot build '/nix/store/2vzim0xvpgv17873p4wbw7n9gaxngac5-discord-0.0.119.drv'.
       Reason: 1 dependency failed.
       Output paths:
         /nix/store/n4li8wz4rnn3jflrjgs30k3w1iz90hrx-discord-0.0.119
22:37:16
@ghpzin:envs.netghpzin So apparently this was load-bearing:
diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix
index 271d279dd4..dea62e4973 100644
--- a/pkgs/by-name/xo/xorg-server/package.nix
+++ b/pkgs/by-name/xo/xorg-server/package.nix
@@ -151,6 +151,11 @@
     mesa
   ];

+  hardeningDisable = [
+    "bindnow"
+    "relro"
+  ];
+
   propagatedBuildInputs = [
     dbus
     libepoxy
and should not have been removed by refactor in https://github.com/NixOS/nixpkgs/pull/446052
Makes nixos tests with xserver work again.
Was there for 10 years before that: https://github.com/NixOS/nixpkgs/commit/27b9f5d65ee452c9a1a49a2e245b2a45ee1d65ab
Probably should have had comment with "Do not remove unless properly tested, without it errors during runtime"
Will send PR tomorrow. 		22:52:49
@k900:0upti.meK900H u h22:54:11
@k900:0upti.meK900 Which one is it? 22:54:15
@k900:0upti.meK900 relro should definitely not matter at least 22:54:31
@k900:0upti.meK900bindnow could be it ugh22:56:27
@k900:0upti.meK900 I wonder why it needs that and xwayland does 22:59:05
@k900:0upti.meK900 Oh wait 22:59:07
@k900:0upti.meK900 It's meson isn't it 22:59:09
@k900:0upti.meK900 It's fucking meson 22:59:13
@k900:0upti.meK900Because something something die GNU autotools22:59:41
@k900:0upti.meK900 ...can we switch xorgserver to meson 22:59:41
@ghpzin:envs.netghpzin Yes, rebuilt without "relro" tests pass.
So I guess will PR tomorrow with just "bindnow" and comment above to not remove without properly testing. 		23:01:04
@k900:0upti.meK900 Does anyone want to attempt this lol 23:01:35
@k900:0upti.meK900 Or do we just let xorg users suffer 23:01:35
@marcusramberg:matrix.orgMarcusKinda feels like there's a lot of them still23:12:08
20 Dec 2025
@ghpzin:envs.netghpzin Yes, rebuilt without "relro" tests pass.
So I guess will PR tomorrow with just "bindnow" and comment above to not remove without properly testing.
---
Sent: https://github.com/NixOS/nixpkgs/pull/472543 		01:35:26
@grimmauld:m.grimmauld.deGrimmauld (any/all)image.png
Download image.png		10:14:24
@grimmauld:m.grimmauld.deGrimmauld (any/all)i have a couple more staging-next fails, will need to investigate10:14:28
@grimmauld:m.grimmauld.deGrimmauld (any/all)add to that i686 ffmpeg10:14:38
@grimmauld:m.grimmauld.deGrimmauld (any/all)* add to that i686 ffmpeg 810:14:45
@k900:0upti.meK900Someone had something for zug10:18:04
@k900:0upti.meK900I think10:18:07
@ghpzin:envs.netghpzinhttps://matrix.to/#/#staging:nixos.org/$7W3URCLoZF1-Ud-Q8kcoysdHRjs7rV_KQ2KCChw7YJI PR for zug was linked above: https://github.com/NixOS/nixpkgs/pull/47245710:30:28
@ghpzin:envs.netghpzin https://matrix.to/#/#staging:nixos.org/$7W3URCLoZF1-Ud-Q8kcoysdHRjs7rV_KQ2KCChw7YJI
PR for zug was linked above: https://github.com/NixOS/nixpkgs/pull/472457
I think I had pgpdump fix for gcc15, will send soon. 		10:31:54

Show newer messages

Back to Room ListRoom Version: 6