From 3775b6ac88720ab10237bab4817313c920daffcb Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Fri, 9 Aug 2024 22:26:51 -0700 Subject: [PATCH] package: remove unused autotools code, empty file I noticed there was some stuff setting configureFlags that definitely do not do anything with meson, so let's rip them out. As for the empty file, it was added when I was thinking I needed a fake C++ target to convince meson to create the necessary dependencies. That was not in fact possible so it should have never been committed. Change-Id: Ied4723d8a5d21aed85f352c48b080ab2c977a496 --- meson/clang-tidy/fake.cc | 0 package.nix | 7 ------- 2 files changed, 7 deletions(-) delete mode 100644 meson/clang-tidy/fake.cc diff --git a/meson/clang-tidy/fake.cc b/meson/clang-tidy/fake.cc deleted file mode 100644 index e69de29bb..000000000 diff --git a/package.nix b/package.nix index ddceb23a5..18c8475bb 100644 --- a/package.nix +++ b/package.nix @@ -314,13 +314,6 @@ stdenv.mkDerivation (finalAttrs: { install_name_tool -change ${boost}/lib/libboost_system.dylib $out/lib/libboost_system.dylib $out/lib/libboost_thread.dylib '' + '' - # Workaround https://github.com/NixOS/nixpkgs/issues/294890. - if [[ -n "''${doCheck:-}" ]]; then - appendToVar configureFlags "--enable-tests" - else - appendToVar configureFlags "--disable-tests" - fi - # Fix up /usr/bin/env shebangs relied on by the build patchShebangs --build tests/ doc/manual/ '';