diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/clfft | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/clfft')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/clfft/default.nix | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/clfft/default.nix b/nixpkgs/pkgs/development/libraries/clfft/default.nix index db18bce72be8..8af7a57e6555 100644 --- a/nixpkgs/pkgs/development/libraries/clfft/default.nix +++ b/nixpkgs/pkgs/development/libraries/clfft/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }: +{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost, opencl-clhpp, ocl-icd, darwin }: +let + inherit (darwin.apple_sdk.frameworks) OpenCL; +in stdenv.mkDerivation rec { pname = "clfft"; version = "2.12.2"; @@ -7,15 +10,24 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "clMathLibraries"; repo = "clFFT"; - rev = "refs/tags/v${version}"; - sha256 = "134vb6214hn00qy84m4djg4hqs6hw19gkp8d0wlq8gb9m3mfx7na"; + rev = "v${version}"; + hash = "sha256-yp7u6qhpPYQpBw3d+VLg0GgMyZONVII8BsBCEoRZm4w="; }; sourceRoot = "source/src"; + postPatch = '' + sed -i '/-m64/d;/-m32/d' CMakeLists.txt + ''; + nativeBuildInputs = [ cmake ]; - buildInputs = [ fftw fftwFloat boost166 opencl-clhpp ocl-icd ]; + buildInputs = [ fftw fftwFloat boost ] + ++ lib.optionals stdenv.isLinux [ opencl-clhpp ocl-icd ] + ++ lib.optionals stdenv.isDarwin [ OpenCL ]; + + # https://github.com/clMathLibraries/clFFT/issues/237 + CXXFLAGS = "-std=c++98"; meta = with lib; { description = "Library containing FFT functions written in OpenCL"; @@ -25,7 +37,7 @@ stdenv.mkDerivation rec { ''; license = licenses.asl20; homepage = "http://clmathlibraries.github.io/clFFT/"; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ chessai ]; }; } |