fix: revert separation of build and native build inputs

grafana · Mar 20, 2024 · 84787f5 · 84787f5
1 parent 303a5f1
commit 84787f5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/nix/default.nix b/nix/default.nix
@@ -70,7 +70,13 @@
       promtail = loki.overrideAttrs (oldAttrs: {
         pname = "promtail";
 
-        buildInputs = if prev.stdenv.hostPlatform.isLinux then oldAttrs.buildInputs ++ [ prev.systemd prev.systemdLibs ] else oldAttrs.buildInputs;
+        buildInputs =
+          let
+            inherit (oldAttrs) buildInputs;
+          in
+          if prev.stdenv.hostPlatform.isLinux then
+            buildInputs ++ (with prev; [ systemd ])
+          else buildInputs;
 
         buildPhase = ''
           export GOCACHE=$TMPDIR/go-cache

diff --git a/nix/packages/loki.nix b/nix/packages/loki.nix
@@ -23,14 +23,11 @@ pkgs.stdenv.mkDerivation {
 
   src = ./../..;
 
-  nativeBuildInputs = with pkgs; [
-    gcc
-    go
-  ];
-
   buildInputs = with pkgs; [
     bash
+    gcc
     git
+    go
     golangci-lint
     nettools
     yamllint