Only add appConfigPath to mix builds

code-supply · Dec 1, 2024 · 165532a · 165532a
1 parent cd984ba
commit 165532a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 16 deletions.
diff --git a/fixtures/example/deps.nix b/fixtures/example/deps.nix
@@ -126,7 +126,6 @@ let
         buildRebar3 {
           inherit version;
           name = "acceptor_pool";
-          appConfigPath = ./config;
 
           src = fetchHex {
             inherit version;
@@ -142,7 +141,6 @@ let
         buildRebar3 {
           inherit version;
           name = "aws_signature";
-          appConfigPath = ./config;
 
           src = fetchHex {
             inherit version;
@@ -199,7 +197,6 @@ let
         buildRebar3 {
           inherit version;
           name = "chatterbox";
-          appConfigPath = ./config;
 
           src = fetchHex {
             inherit version;
@@ -240,7 +237,6 @@ let
         buildRebar3 {
           inherit version;
           name = "ctx";
-          appConfigPath = ./config;
 
           src = fetchHex {
             inherit version;
@@ -560,7 +556,6 @@ let
         buildRebar3 {
           inherit version;
           name = "gproc";
-          appConfigPath = ./config;
 
           src = fetchHex {
             inherit version;
@@ -576,7 +571,6 @@ let
         buildRebar3 {
           inherit version;
           name = "grpcbox";
-          appConfigPath = ./config;
 
           src = fetchHex {
             inherit version;
@@ -599,7 +593,6 @@ let
         buildRebar3 {
           inherit version;
           name = "hpack";
-          appConfigPath = ./config;
 
           src = fetchHex {
             inherit version;
@@ -720,7 +713,6 @@ let
         buildRebar3 {
           inherit version;
           name = "opentelemetry";
-          appConfigPath = ./config;
 
           src = fetchHex {
             inherit version;
@@ -756,7 +748,6 @@ let
         buildRebar3 {
           inherit version;
           name = "opentelemetry_exporter";
-          appConfigPath = ./config;
 
           src = fetchHex {
             inherit version;
@@ -817,7 +808,6 @@ let
         buildRebar3 {
           inherit version;
           name = "png";
-          appConfigPath = ./config;
 
           src = fetchHex {
             inherit version;
@@ -970,7 +960,6 @@ let
         buildRebar3 {
           inherit version;
           name = "telemetry";
-          appConfigPath = ./config;
 
           src = fetchHex {
             inherit version;
@@ -1006,7 +995,6 @@ let
         buildRebar3 {
           inherit version;
           name = "tls_certificate_check";
-          appConfigPath = ./config;
 
           src = fetchHex {
             inherit version;

diff --git a/lib/deps_nix/derivation.ex b/lib/deps_nix/derivation.ex
@@ -143,8 +143,7 @@ defmodule DepsNix.Derivation do
         in
         #{drv.builder} {
           inherit version;
-          name = "#{drv.name}";
-          appConfigPath = #{format_path(drv.app_config_path)};
+          name = "#{drv.name}";#{format_app_config_path(drv)}
 
           src = #{src(drv.src)}#{beam_deps(drv.beam_deps)}
         };
@@ -174,8 +173,25 @@ defmodule DepsNix.Derivation do
       |> Util.indent(from: 2)
     end
 
-    defp format_path(path) do
-      if String.starts_with?(path, "."), do: path, else: "./#{path}"
+    defp format_app_config_path(%DepsNix.Derivation{
+           builder: "buildMix",
+           app_config_path: path
+         }) do
+      "\nappConfigPath = #{prefix_path(path)};"
+      |> Util.indent(from: 1)
+      |> Util.indent(from: 1)
+    end
+
+    defp format_app_config_path(_drv) do
+      ""
+    end
+
+    defp prefix_path(<<".", _rest::binary>> = path) do
+      path
+    end
+
+    defp prefix_path(path) do
+      "./#{path}"
     end
   end
 end
diff --git a/test/deps_nix/derivation_test.exs b/test/deps_nix/derivation_test.exs
@@ -236,6 +236,14 @@ defmodule DepsNix.DerivationTest do
   end
 
   describe "string representation" do
+    test "rebar3 builds don't get appConfigPaths" do
+      refute dep(builders: [:rebar3], scm: Mix.SCM.Hex)
+             |> pick()
+             |> Derivation.from(%DepsNix.Options{})
+             |> to_string()
+             |> String.contains?("appConfigPath")
+    end
+
     test "paths get special treatment" do
       assert %Derivation{
                builder: "buildMix",