Skip to content

Commit

Permalink
Merge pull request #66651 from lilyball/erlang_darwin_10.12
Browse files Browse the repository at this point in the history
erlang: Fix build error on darwin
  • Loading branch information
Mic92 committed Aug 15, 2019
2 parents 2edd710 + 6325905 commit 31a577c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/erlang/R19.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
'';
}
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/erlang/R20.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
'';
}
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/erlang/R21.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
'';
}
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/erlang/R22.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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' ""
'';
}

0 comments on commit 31a577c

Please sign in to comment.