From 63259057a82fd833879426657dc555b6100ea0f5 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Wed, 14 Aug 2019 15:54:56 -0700 Subject: [PATCH] erlang: Fix build error on darwin Stop hardcoding 10.10 as the platform when building. Instead we'll use $MACOSX_DEPLOYMENT_TARGET so erlang doesn't have to be updated again the next time that's changed. --- pkgs/development/interpreters/erlang/R19.nix | 2 +- pkgs/development/interpreters/erlang/R20.nix | 2 +- pkgs/development/interpreters/erlang/R21.nix | 2 +- pkgs/development/interpreters/erlang/R22.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index e0d4ecbc95a..25a3f662565 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -14,6 +14,6 @@ mkDerivation rec { ]; prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" ''; } diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix index c408d21d9b3..016e175d6b5 100644 --- a/pkgs/development/interpreters/erlang/R20.nix +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -5,6 +5,6 @@ mkDerivation rec { sha256 = "0v2iiyzss8hiih98wvj0gi2qzdmmhh7bvc9p025wlfm4k7r1109a"; prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" ''; } diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index 60eb6c8a6a5..e21bf6dafbf 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -5,6 +5,6 @@ mkDerivation rec { sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw"; prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" ''; } diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix index 1af047f43bd..a8c05513c5a 100644 --- a/pkgs/development/interpreters/erlang/R22.nix +++ b/pkgs/development/interpreters/erlang/R22.nix @@ -5,7 +5,7 @@ mkDerivation rec { sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai"; prePatch = '' - substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' '10.10' + substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' "" ''; }