From fbeae37f530a9266d56f6efb0d216f0a9d31020e Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 13 Nov 2024 15:46:50 +0000 Subject: [PATCH] wangle: reorder attributes (cherry picked from commit 4a2ad7732b9f179c0878a9978bcf142e183abdf7) (cherry picked from commit 3de5bf9d3057aaec3fab570784f8ff851d8dfe19) --- pkgs/by-name/wa/wangle/package.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index b0984f9477fd..1d3dd1c0bb3f 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -28,13 +28,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - cmakeDir = "../wangle"; - - cmakeFlags = [ - "-Wno-dev" - (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) - ]; - buildInputs = [ double-conversion @@ -50,10 +43,19 @@ stdenv.mkDerivation (finalAttrs: { (darwinMinVersionHook "11.0") ]; - doCheck = true; checkInputs = [ gtest ]; + + cmakeDir = "../wangle"; + + cmakeFlags = [ + "-Wno-dev" + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) + ]; + + doCheck = true; + preCheck = let disabledTests =