From 4ec35ea620d3019c47596e836b8137fcf45eac41 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 20 Jan 2025 14:21:56 +0800 Subject: nongnu: replace-mesa: Use ‘package-input-grafting’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * nongnu/packages/nvidia.scm (mesa/fake,mesa/fake-beta): Delete variables. (replace-mesa): Use ‘package-input-grafting’. --- nongnu/packages/nvidia.scm | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'nongnu/packages') diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index 351a398..3ce96cd 100644 --- a/nongnu/packages/nvidia.scm +++ b/nongnu/packages/nvidia.scm @@ -17,6 +17,7 @@ #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license-gnu:) #:use-module ((nonguix licenses) #:prefix license:) + #:use-module (nonguix utils) #:use-module (guix build-system linux-module) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) @@ -51,7 +52,8 @@ #:use-module (gnu packages xorg) #:use-module (nongnu packages linux) #:use-module (nongnu packages video) - #:use-module (ice-9 match)) + #:use-module (ice-9 match) + #:export (replace-mesa)) (define-public %nvidia-environment-variable-regexps '("^__GL_" ; NVIDIA OpenGL settings. @@ -829,19 +831,8 @@ variables @code{__GLX_VENDOR_LIBRARY_NAME=nvidia} and (string-length (package-version mesa-for-nvda)) #\0))))) -(define mesa/fake - (package - (inherit mesa) - (replacement nvda))) - -(define-public mesa/fake-beta - (hidden-package - (package - (inherit mesa) - (replacement nvdb)))) - -(define-public replace-mesa - (package-input-rewriting `((,mesa . ,mesa/fake)))) +(define replace-mesa + (package-input-grafting `((,mesa . ,nvda)))) ;;; -- cgit v1.2.3