From 259b15f25d4d98ac8c097cb5d9b2aa76482ceb40 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Wed, 10 May 2023 12:06:54 -0400 Subject: [PATCH] rewrite-tbd: avoid infinite recursion when cmake is not cmakeMinimal This was found while working on the Darwin stdenv rework. This change allows rewrite-tbd to use the provided Makefile instead of depending on cmake and pkg-config. Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/os-specific/darwin/rewrite-tbd/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/rewrite-tbd/default.nix b/pkgs/os-specific/darwin/rewrite-tbd/default.nix index e5ef118e514c..5cf63754dfbb 100644 --- a/pkgs/os-specific/darwin/rewrite-tbd/default.nix +++ b/pkgs/os-specific/darwin/rewrite-tbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libyaml }: +{ stdenv, lib, fetchFromGitHub, libyaml }: stdenv.mkDerivation { pname = "rewrite-tbd"; @@ -11,9 +11,17 @@ stdenv.mkDerivation { sha256 = "08sk91zwj6n9x2ymwid2k7y0rwv5b7p6h1b25ipx1dv0i43p6v1a"; }; - nativeBuildInputs = [ cmake pkg-config ]; + # Nix takes care of these paths. Avoiding the use of `pkg-config` prevents an infinite recursion. + postPatch = '' + substituteInPlace Makefile.boot \ + --replace '$(shell pkg-config --cflags yaml-0.1)' "" \ + --replace '$(shell pkg-config --libs yaml-0.1)' "-lyaml" + ''; + buildInputs = [ libyaml ]; + makeFlags = [ "-f" "Makefile.boot" "PREFIX=${placeholder "out"}"]; + meta = with lib; { homepage = "https://github.com/thefloweringash/rewrite-tbd/"; description = "Rewrite filepath in .tbd to Nix applicable format";