From fa8d4bd3d572713fc4323c8709fcadfa9b91fef8 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 6 Dec 2024 12:39:29 +0300 Subject: [PATCH 1/2] dri-pkgconfig-stub: init This is a tiny stub that can be provided to things that just want to know where to find DRI drivers for whatever reason (looking at you, Chromium), so they don't have to pull in all of Mesa. --- .../by-name/dr/dri-pkgconfig-stub/package.nix | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 pkgs/by-name/dr/dri-pkgconfig-stub/package.nix diff --git a/pkgs/by-name/dr/dri-pkgconfig-stub/package.nix b/pkgs/by-name/dr/dri-pkgconfig-stub/package.nix new file mode 100644 index 000000000000..9b5b5265882a --- /dev/null +++ b/pkgs/by-name/dr/dri-pkgconfig-stub/package.nix @@ -0,0 +1,20 @@ +{ + lib, + writeTextFile, + mesa, +}: +writeTextFile { + name = "dri-pkgconfig-stub"; + + text = '' + dridriverdir=${mesa.driverLink}/lib/dri + + Name: dri + Version: ${mesa.version} + Description: Nixpkgs graphics driver path stub + ''; + + destination = "/lib/pkgconfig/dri.pc"; + + meta.badPlatforms = lib.platforms.darwin; +} From 31990f5fd019f15eed264e82850be46638eba815 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 6 Dec 2024 12:40:07 +0300 Subject: [PATCH 2/2] chromium: use dri-pkgconfig-stub --- pkgs/applications/networking/browsers/chromium/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3c8fd7971359..d64b28765a7e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -37,7 +37,7 @@ , bison, gperf, libkrb5 , glib, gtk3, dbus-glib , libXScrnSaver, libXcursor, libXtst, libxshmfence, libGLU, libGL -, libgbm +, dri-pkgconfig-stub, libgbm , pciutils, protobuf, speechd-minimal, libXdamage, at-spi2-core , pipewire , libva @@ -273,7 +273,7 @@ let util-linux alsa-lib libkrb5 glib gtk3 dbus-glib - libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL libgbm + libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL dri-pkgconfig-stub libgbm pciutils protobuf speechd-minimal libXdamage at-spi2-core pipewire libva