ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-01 08:25:55 +03:00
Code Issues Projects Releases Wiki Activity

erlang: Fix build error on darwin

Browse Source 
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.
This commit is contained in:
Lily Ballard 2019-08-14 15:54:56 -07:00
parent f2e631148a
commit 63259057a8
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/erlang/R19.nix
View File

@ -14,6 +14,6 @@ mkDerivation rec {
]; ];
prePatch = '' prePatch = ''
substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"
''; '';
} }

2
pkgs/development/interpreters/erlang/R20.nix
View File

@ -5,6 +5,6 @@ mkDerivation rec {
sha256 = "0v2iiyzss8hiih98wvj0gi2qzdmmhh7bvc9p025wlfm4k7r1109a"; sha256 = "0v2iiyzss8hiih98wvj0gi2qzdmmhh7bvc9p025wlfm4k7r1109a";
prePatch = '' prePatch = ''
substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"
''; '';
} }

2
pkgs/development/interpreters/erlang/R21.nix
View File

@ -5,6 +5,6 @@ mkDerivation rec {
sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw"; sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw";
prePatch = '' prePatch = ''
substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"
''; '';
} }

2
pkgs/development/interpreters/erlang/R22.nix
View File

@ -5,7 +5,7 @@ mkDerivation rec {
sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai"; sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai";
prePatch = '' 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' "" substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' ""
''; '';
} }