From cd0b32e234fcf17bbc7195918cdcd289b90c39e5 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Fri, 28 Jul 2023 21:05:57 -0400 Subject: Add NIX_CFLAGS_COMPILE and some deps --- Biz/Bild.hs | 5 +++++ Biz/Bild.nix | 3 +++ 2 files changed, 8 insertions(+) (limited to 'Biz') diff --git a/Biz/Bild.hs b/Biz/Bild.hs index 4f8b1e4..34e30e9 100644 --- a/Biz/Bild.hs +++ b/Biz/Bild.hs @@ -379,6 +379,10 @@ analyze hmap ns = case Map.lookup ns hmap of Namespace.Sh -> pure Nothing Namespace.C -> Meta.detectAll "//" contentLines |> \Meta.Parsed {..} -> do + nixCFlags <- + Env.getEnv "NIX_CFLAGS_COMPILE" + /> Text.pack + /> Text.words langdepFlags <- null pdep ?. ( runw "pkg-config" ("--cflags" : Set.toList pdep), @@ -401,6 +405,7 @@ analyze hmap ns = case Map.lookup ns hmap of [ [o, dir, str absPath] ++ langdepFlags ++ sysdepFlags + ++ nixCFlags ++ (map Text.pack <| Set.toList parg) | let outable = pout /= Meta.None, o <- outable ?: (["-o"], []), diff --git a/Biz/Bild.nix b/Biz/Bild.nix index 69fe5e1..a51a3d0 100644 --- a/Biz/Bild.nix +++ b/Biz/Bild.nix @@ -50,6 +50,9 @@ rec { private.ghcPackageSetBild rustc gcc + gdb + valgrind + argp-standalone (private.sbclWith (p: with p; [asdf alexandria])) # just enough to build Example.lisp ]; -- cgit v1.2.3