dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

libclc: absorb into llvmPackages(16)

Browse Source
This commit is contained in:
K900 2023-10-28 14:24:04 +03:00
parent 2bfbf5b984
commit e6cbaa94f9
6 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/llvm/16/default.nix
View File

@ -309,6 +309,12 @@ in let
extraBuildCommands = mkExtraBuildCommands0 cc;
};
# Has to be in tools despite mostly being a library,
# because we use a native helper executable from a
# non-cross build in cross builds.
libclc = callPackage ./libclc {
inherit buildLlvmTools;
};
});
libraries = lib.makeExtensible (libraries: let

28
pkgs/development/libraries/libclc/default.nix → pkgs/development/compilers/llvm/16/libclc/default.nix
View File

@ -1,16 +1,16 @@
{ lib, stdenv, fetchFromGitHub, buildPackages, ninja, cmake, python3, llvm_14 }:
{ lib, stdenv, version, runCommand, monorepoSrc, llvm, buildPackages, buildLlvmTools, ninja, cmake, python3 }:
stdenv.mkDerivation rec {
pname = "libclc";
version = "16.0.3";
inherit version;
src = fetchFromGitHub {
owner = "llvm";
repo = "llvm-project";
rev = "llvmorg-${version}";
hash = "sha256-paWwnoU3XMqreRgh9JbT1tDMTwq/ZL0ss3SJTteEGL0=";
};
sourceRoot = "${src.name}/libclc";
src = runCommand "${pname}-src-${version}" {} ''
mkdir -p "$out"
cp -r ${monorepoSrc}/cmake "$out"
cp -r ${monorepoSrc}/${pname} "$out"
'';
sourceRoot = "${src.name}/${pname}";
outputs = [ "out" "dev" ];
@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
'find_program( LLVM_CLANG clang PATHS "${buildPackages.clang_14.cc}/bin" NO_DEFAULT_PATH )' \
'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \
--replace 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
'find_program( LLVM_AS llvm-as PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \
'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \
--replace 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
'find_program( LLVM_LINK llvm-link PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \
'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \
--replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
'find_program( LLVM_OPT opt PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \
'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \
--replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator}/bin" NO_DEFAULT_PATH )'
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ cmake ninja python3 ];
buildInputs = [ llvm_14 ];
buildInputs = [ llvm ];
strictDeps = true;
postInstall = ''

0
pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch → pkgs/development/compilers/llvm/16/libclc/libclc-gnu-install-dirs.patch
View File

3
pkgs/development/libraries/mesa/default.nix
View File

@ -64,7 +64,6 @@
, enableOSMesa ? stdenv.isLinux
, enableOpenCL ? stdenv.isLinux && stdenv.isx86_64
, enablePatentEncumberedCodecs ? true
, libclc
, jdupes
, rustc
, rust-bindgen
@ -226,7 +225,7 @@ self = stdenv.mkDerivation {
python3Packages.python # for shebang
] ++ lib.optionals haveWayland [ wayland wayland-protocols ]
++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal udev lm_sensors ]
++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' spirv-llvm-translator' ]
++ lib.optionals enableOpenCL [ llvmPackages.libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' spirv-llvm-translator' ]
++ lib.optional withValgrind valgrind-light
++ lib.optional haveZink vulkan-loader
++ lib.optional haveDozen directx-headers;

1
pkgs/top-level/aliases.nix
View File

@ -434,6 +434,7 @@ mapAliases ({
libbencodetools = bencodetools; # Added 2022-07-30
libbpf_1 = libbpf; # Added 2022-12-06
libcap_pam = throw "'libcap_pam' has been replaced with 'libcap'"; # Converted to throw 2023-09-10
libclc = llvmPackages_latest.libclc; # Added 2023-10-28
libgme = game-music-emu; # Added 2022-07-20
libgpgerror = libgpg-error; # Added 2021-09-04
libheimdal = heimdal; # Added 2022-11-18

2
pkgs/top-level/all-packages.nix
View File

@ -22597,8 +22597,6 @@ with pkgs;
libcint = callPackage ../development/libraries/libcint { };
libclc = callPackage ../development/libraries/libclc { };
libcli = callPackage ../development/libraries/libcli { };
libclthreads = callPackage ../development/libraries/libclthreads { };