From c10a07551721f713392d777c27ac802c99e697bd Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 8 Nov 2021 17:44:04 -0800 Subject: [PATCH] clinfo: enable on darwin --- pkgs/tools/system/clinfo/default.nix | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix index 9c5b54f554b..a9e7c0c81de 100644 --- a/pkgs/tools/system/clinfo/default.nix +++ b/pkgs/tools/system/clinfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ocl-icd, opencl-headers }: +{ lib, stdenv, fetchFromGitHub, ocl-icd, opencl-headers, OpenCL }: stdenv.mkDerivation rec { pname = "clinfo"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-0ijfbfv1F6mnt1uFH/A4yOADJoAFrPMa3yAOFJW53ek="; }; - buildInputs = [ ocl-icd opencl-headers ]; - - NIX_CFLAGS_COMPILE = [ - "-Wno-error=stringop-overflow" - "-Wno-error=stringop-truncation" + buildInputs = lib.optionals (!stdenv.isDarwin) [ + ocl-icd + opencl-headers + ] ++ lib.optionals stdenv.isDarwin [ + OpenCL ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Print all known information about all available OpenCL platforms and devices in the system"; homepage = "https://github.com/Oblomov/clinfo"; license = licenses.cc0; - maintainers = with maintainers; [ athas ]; - platforms = platforms.linux; + maintainers = with maintainers; [ athas r-burns ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92672fef81a..fb255be8b71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31915,7 +31915,9 @@ with pkgs; click = callPackage ../applications/networking/cluster/click { }; - clinfo = callPackage ../tools/system/clinfo { }; + clinfo = callPackage ../tools/system/clinfo { + inherit (darwin.apple_sdk.frameworks) OpenCL; + }; clpeak = callPackage ../tools/misc/clpeak { };