From: Wroclaw Date: Thu, 17 Jul 2025 22:18:16 +0000 (+0200) Subject: nix : use optionalAttrs for env mkDerivation attrset argument (#14726) X-Git-Tag: upstream/0.0.6073~148 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=760b4484e3c192a2649a6ffd0d90086c5558f849;p=pkg%2Fggml%2Fsources%2Fllama.cpp nix : use optionalAttrs for env mkDerivation attrset argument (#14726) --- diff --git a/.devops/nix/package.nix b/.devops/nix/package.nix index 6e8050a4..651a54db 100644 --- a/.devops/nix/package.nix +++ b/.devops/nix/package.nix @@ -47,6 +47,7 @@ let inherit (lib) cmakeBool cmakeFeature + optionalAttrs optionals strings ; @@ -197,7 +198,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ]; # Environment variables needed for ROCm - env = optionals useRocm { + env = optionalAttrs useRocm { ROCM_PATH = "${rocmPackages.clr}"; HIP_DEVICE_LIB_PATH = "${rocmPackages.rocm-device-libs}/amdgcn/bitcode"; };