From 5db374cb500b687039ba4701b205ca7dfa67caba Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 30 Nov 2023 10:40:57 -0500
Subject: [PATCH] Cleanup deps

- `nativeBuildInputs` vs `buildInputs`

- narrow down `with`s for clarity

- use `autoreconfHook` not `bootstrap` script

These sorts of changes have also been done in the Nix repo.
---
 README.md |  2 +-
 bootstrap |  2 --
 flake.nix | 31 +++++++++++++++++--------------
 3 files changed, 18 insertions(+), 17 deletions(-)
 delete mode 100755 bootstrap

diff --git a/README.md b/README.md
index 54cb9a93..2a085325 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ $ nix-build
 You can use the provided shell.nix to get a working development environment:
 ```
 $ nix-shell
-$ ./bootstrap
+$ autoreconfPhase
 $ configurePhase # NOTE: not ./configure
 $ make
 ```
diff --git a/bootstrap b/bootstrap
deleted file mode 100755
index 091b0ee4..00000000
--- a/bootstrap
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/sh -e
-exec autoreconf -vfi
diff --git a/flake.nix b/flake.nix
index 7e7d50e2..ea96ac2e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,10 +61,11 @@
 
         };
 
-        hydra = with final; let
-          perlDeps = buildEnv {
+        hydra = let
+          inherit (final) lib stdenv;
+          perlDeps = final.buildEnv {
             name = "hydra-perl-deps";
-            paths = with perlPackages; lib.closePropagation
+            paths = with final.perlPackages; lib.closePropagation
               [
                 AuthenSASL
                 CatalystActionREST
@@ -98,7 +99,7 @@
                 FileSlurper
                 FileWhich
                 final.nix.perl-bindings
-                git
+                final.git
                 IOCompress
                 IPCRun
                 IPCRun3
@@ -141,15 +142,20 @@
 
           src = self;
 
-          buildInputs =
-            [
+          nativeBuildInputs =
+            with final.buildPackages; [
               makeWrapper
-              autoconf
+              autoreconfHook
               automake
               libtool
-              unzip
               nukeReferences
               pkg-config
+              mdbook
+            ];
+
+          buildInputs =
+            with final; [
+              unzip
               libpqxx
               top-git
               mercurial
@@ -162,7 +168,6 @@
               final.nix
               perlDeps
               perl
-              mdbook
               pixz
               boost
               postgresql_13
@@ -172,7 +177,7 @@
               prometheus-cpp
             ];
 
-          checkInputs = [
+          checkInputs = with final; [
             cacert
             foreman
             glibcLocales
@@ -181,7 +186,7 @@
             python3
           ];
 
-          hydraPath = lib.makeBinPath (
+          hydraPath = with final; lib.makeBinPath (
             [
               subversion
               openssh
@@ -203,7 +208,7 @@
             ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ]
           );
 
-          OPENLDAP_ROOT = openldap;
+          OPENLDAP_ROOT = final.openldap;
 
           shellHook = ''
             pushd $(git rev-parse --show-toplevel) >/dev/null
@@ -218,8 +223,6 @@
             popd >/dev/null
           '';
 
-          preConfigure = "autoreconf -vfi";
-
           NIX_LDFLAGS = [ "-lpthread" ];
 
           enableParallelBuilding = true;