From b11f561d51abe462c47f14fc58ac491f3d787085 Mon Sep 17 00:00:00 2001
From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Thu, 19 Dec 2024 10:18:56 +0100
Subject: [PATCH] packages/nixos: use libnvidia-container-custom

Make `libnvidia-container-custom` the default `libnvidia-container` in our NixOS build.
---
 packages/by-name/libnvidia-container-custom/package.nix | 5 ++++-
 packages/by-name/mkNixosConfig/package.nix              | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/by-name/libnvidia-container-custom/package.nix b/packages/by-name/libnvidia-container-custom/package.nix
index 503f27c1d0..d52cfb0a7f 100644
--- a/packages/by-name/libnvidia-container-custom/package.nix
+++ b/packages/by-name/libnvidia-container-custom/package.nix
@@ -1,3 +1,6 @@
+# Copyright 2024 Edgeless Systems GmbH
+# SPDX-License-Identifier: AGPL-3.0-only
+
 # Upstream package from https://github.com/NixOS/nixpkgs/blob/nixos-24.11/pkgs/by-name/li/libnvidia-container/package.nix#L145
 # Adapted to use custom paths for binary resolving specialized to the NixOS image we use this in. As this is incompatible with
 # non-NixOS deployments, this cannot be upstreamed.
@@ -50,7 +53,7 @@ stdenv.mkDerivation rec {
   patches = [
     (replaceVars ./fix-library-resolving.patch {
       inherit (addDriverRunpath) driverLink;
-      binaryPath = (lib.makeBinPath binaryPaths);
+      binaryPath = lib.makeBinPath binaryPaths;
     })
 
     ./inline-c-struct.patch
diff --git a/packages/by-name/mkNixosConfig/package.nix b/packages/by-name/mkNixosConfig/package.nix
index a96255bcc6..85c7f66fe1 100644
--- a/packages/by-name/mkNixosConfig/package.nix
+++ b/packages/by-name/mkNixosConfig/package.nix
@@ -49,6 +49,7 @@ lib.makeOverridable (
             kata-runtime
             kata-kernel-uvm
             ;
+          libnvidia-container = outerPkgs.libnvidia-container-custom;
         })
       ];