JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4604 from pmahoney/j-darwin

Browse Source 
j: Relax platform restriction.
This commit is contained in:
Michael Raskin 2014-10-20 21:57:50 +04:00
commit c47d41d783
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/interpreters/j/default.nix
View File

@ -29,12 +29,12 @@ rec {
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["doUnpack" "doBuildJ" "doDeploy"]; phaseNames = ["doUnpack" "doBuildJ" "doDeploy"];
bits = if a.stdenv.system == "i686-linux" then bits = if a.stdenv.is64bit then
"32"
else if a.stdenv.system == "x86_64-linux" then
"64" "64"
else else if a.stdenv.isi686 then
throw "Oops, unknown system: ${a.stdenv.system}"; "32"
else
builtins.trace "assuming ${a.stdenv.system} is 32 bits" "32";
doBuildJ = a.fullDepEntry '' doBuildJ = a.fullDepEntry ''
sed -i bin/jconfig -e 's@bits=32@bits=${bits}@g; s@readline=0@readline=1@; s@LIBREADLINE=""@LIBREADLINE=" -lreadline "@' sed -i bin/jconfig -e 's@bits=32@bits=${bits}@g; s@readline=0@readline=1@; s@LIBREADLINE=""@LIBREADLINE=" -lreadline "@'
@ -69,7 +69,7 @@ rec {
raskin raskin
]; ];
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
linux; unix;
license = a.lib.licenses.gpl3Plus; license = a.lib.licenses.gpl3Plus;
}; };
passthru = { passthru = {