diff options
| author | Christian Albrecht <christian.albrecht@mayflower.de> | 2022-05-06 10:30:03 +0200 |
|---|---|---|
| committer | Christian Albrecht <christian.albrecht@mayflower.de> | 2022-05-06 10:30:03 +0200 |
| commit | 9d8bbb544b43a1ba9eac7deab92195a297a17d4d (patch) | |
| tree | 86252b0dae33dcddd591fc4d06d709327f0bdeeb /pkgs/development/compilers/spirv-llvm-translator | |
| parent | 4c4d0d6bc3bd09b33cce0d547892e32fc9649a0c (diff) | |
spirv-llvm-translator: fix duplicate makeFlags merge
See https://github.com/NixOS/nixpkgs/pull/171656#issuecomment-1119263828 there was a conflict with #162603 and a GitHub Action did a bad merge in 4cab9ae#diff-1aeab0da45b3afb6688d321042021a2ebad96758fc495d92aaadb50cc9aa22c7R28, adding a second makeFlags and breaking the build.
Diffstat (limited to 'pkgs/development/compilers/spirv-llvm-translator')
| -rw-r--r-- | pkgs/development/compilers/spirv-llvm-translator/default.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 03a14ad9180d9..b0ba8508fc359 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { checkInputs = [ lit ]; - makeFlags = [ "llvm-spirv" ]; - cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=ON" "-DLLVM_DIR=${llvm_11.dev}" |