1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 16:42:09 +00:00

Merge pull request #143863 from figsoda/lucky-commit-fix-darwin

lucky-commit: fix darwin build
This commit is contained in:
figsoda 2021-10-30 14:32:02 -04:00 committed by GitHub
commit 86661be087
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

View file

@ -2,6 +2,8 @@
, rustPlatform
, fetchFromGitHub
, withOpenCL ? true
, stdenv
, OpenCL
, ocl-icd
}:
@ -18,7 +20,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-MvopLKhovwXaEmRgXnAzJeuhPgqnMjt0EtKUGSWFpaY=";
buildInputs = lib.optional withOpenCL [ ocl-icd ];
buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd);
cargoBuildFlags = lib.optional (!withOpenCL) "--no-default-features";

View file

@ -26312,7 +26312,9 @@ with pkgs;
lscolors = callPackage ../applications/misc/lscolors { };
lucky-commit = callPackage ../applications/version-management/git-and-tools/lucky-commit { };
lucky-commit = callPackage ../applications/version-management/git-and-tools/lucky-commit {
inherit (darwin.apple_sdk.frameworks) OpenCL;
};
luddite = with python3Packages; toPythonApplication luddite;