From 9d8bbb544b43a1ba9eac7deab92195a297a17d4d Mon Sep 17 00:00:00 2001 From: Christian Albrecht Date: Fri, 6 May 2022 10:30:03 +0200 Subject: [PATCH] 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. --- pkgs/development/compilers/spirv-llvm-translator/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 03a14ad9180..b0ba8508fc3 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}"