From 67d0a225c18342ca397ad12f02169fcb77f70a70 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Dec 2025 14:20:33 +0100 Subject: [PATCH 1/2] addDriverRunpath: fix for structuredAttrs --- pkgs/by-name/ad/addDriverRunpath/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ad/addDriverRunpath/package.nix b/pkgs/by-name/ad/addDriverRunpath/package.nix index 56026b1fc908..7e31a396b463 100644 --- a/pkgs/by-name/ad/addDriverRunpath/package.nix +++ b/pkgs/by-name/ad/addDriverRunpath/package.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { # Named "opengl-driver" for legacy reasons, but it is the path to # hardware drivers installed by NixOS - driverLink = "/run/opengl-driver" + lib.optionalString stdenv.hostPlatform.isi686 "-32"; + env.driverLink = "/run/opengl-driver" + lib.optionalString stdenv.hostPlatform.isi686 "-32"; buildCommand = '' mkdir -p $out/nix-support From 2cb85634454cbbcf7ad155f0d8540d026d7a8432 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Dec 2025 17:20:18 +0100 Subject: [PATCH 2/2] addDriverRunpath: rewrite using makeSetupHook --- pkgs/by-name/ad/addDriverRunpath/package.nix | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ad/addDriverRunpath/package.nix b/pkgs/by-name/ad/addDriverRunpath/package.nix index 7e31a396b463..29832b303ad6 100644 --- a/pkgs/by-name/ad/addDriverRunpath/package.nix +++ b/pkgs/by-name/ad/addDriverRunpath/package.nix @@ -1,14 +1,14 @@ -{ lib, stdenv }: +{ + lib, + stdenv, + makeSetupHook, +}: +makeSetupHook { + name = "add-driver-runpath-hook"; -stdenv.mkDerivation { - name = "add-driver-runpath"; - - # Named "opengl-driver" for legacy reasons, but it is the path to - # hardware drivers installed by NixOS - env.driverLink = "/run/opengl-driver" + lib.optionalString stdenv.hostPlatform.isi686 "-32"; - - buildCommand = '' - mkdir -p $out/nix-support - substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook - ''; -} + substitutions = { + # Named "opengl-driver" for legacy reasons, but it is the path to + # hardware drivers installed by NixOS + driverLink = "/run/opengl-driver" + lib.optionalString stdenv.hostPlatform.isi686 "-32"; + }; +} ./setup-hook.sh