suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge pull request #13557 from KoviRobi/inferno-update

Browse Source 
inferno: 645 -> 785
This commit is contained in:
Arseniy Seroka 2016-02-29 01:04:30 +03:00
commit 8c7ccdd556
1 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pkgs/applications/inferno/default.nix
View File

@ -1,55 +1,47 @@
{ fetchurl, fetchhg, stdenv, xorg, gcc46, makeWrapper }: { fetchurl, fetchhg, stdenv, xorg, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
# Inferno is a rolling release from a mercurial repository. For the verison number # Inferno is a rolling release from a mercurial repository. For the verison number
# of the package I'm using the mercurial commit number. # of the package I'm using the mercurial commit number.
version = "645"; rev = "785";
name = "inferno-${version}"; name = "inferno-${rev}";
host = "Linux";
# The mercurial repository does not contain all the components needed for the objtype = "386";
# runtime system. The 'base' package contains these. For this package I download
# the base, extract the elements required from that, and add them to the source
# pulled from the mercurial repository.
srcBase = fetchurl {
url = "http://www.vitanuova.com/dist/4e/inferno-20100120.tgz";
sha256 = "0msvy3iwl4n5k0ry0xiyysjkq0qsawmwn3hvg67hbi5y8g7f7l88";
};
src = fetchhg { src = fetchhg {
url = "https://inferno-os.googlecode.com/hg"; url = "https://bitbucket.org/inferno-os/inferno-os";
rev = "7ab390b860ca"; sha256 = "1b428ma9fi5skvfrxp91dr43a62kax89wmx7950ahc1cxyx90k7x";
sha256 = "09y0iclb3yy10gw1p0182sddg64xh60q2fx4ai7lxyfb65i76qbh";
}; };
# Fails with gcc48 due to inferno triggering an optimisation issue with floating point. buildInputs = [ makeWrapper ] ++ (with xorg; [ libX11 libXpm libXext xextproto ]);
buildInputs = [ gcc46 xorg.libX11 xorg.libXpm xorg.libXext xorg.xextproto makeWrapper ];
infernoWrapper = ./inferno; infernoWrapper = ./inferno;
configurePhase = '' configurePhase = ''
tar --strip-components=1 -xvf $srcBase inferno/fonts inferno/Mkdirs inferno/empties sed -e 's@^ROOT=.*$@ROOT='"$out"'/share/inferno@g' \
sed -e 's@^ROOT=.*$@ROOT='"$out"'/share/inferno@g' -e 's@^OBJTYPE=.*$@OBJTYPE=386@g' -e 's@^SYSHOST=.*$@SYSHOST=Linux@g' -i mkconfig -e 's@^OBJTYPE=.*$@OBJTYPE=${objtype}@g' \
mkdir prof -e 's@^SYSHOST=.*$@SYSHOST=${host}@g' \
sh Mkdirs -i mkconfig
# Get rid of an annoying warning
sed -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' \
-i ${host}/${objtype}/include/lib9.h
''; '';
buildPhase = '' buildPhase = ''
export PATH=$PATH:$out/share/inferno/Linux/386/bin
mkdir -p $out/share/inferno mkdir -p $out/share/inferno
cp -r . $out/share/inferno cp -r . $out/share/inferno
./makemk.sh ./makemk.sh
export PATH=$PATH:$out/share/inferno/Linux/386/bin
mk nuke mk nuke
mk mk
''; '';
installPhase = '' installPhase = ''
# Installs executables in $out/share/inferno/${host}/${objtype}/bin
mk install mk install
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper $out/share/inferno/Linux/386/bin/emu $out/bin/emu \ # Install start-up script
--suffix LD_LIBRARY_PATH ':' "${gcc46.cc}/lib" \
--suffix PATH ':' "$out/share/inferno/Linux/386/bin"
makeWrapper $infernoWrapper $out/bin/inferno \ makeWrapper $infernoWrapper $out/bin/inferno \
--suffix LD_LIBRARY_PATH ':' "${gcc46.cc}/lib" \
--suffix PATH ':' "$out/share/inferno/Linux/386/bin" \ --suffix PATH ':' "$out/share/inferno/Linux/386/bin" \
--set INFERNO_ROOT "$out/share/inferno" --set INFERNO_ROOT "$out/share/inferno"
''; '';
@ -58,7 +50,7 @@ stdenv.mkDerivation rec {
description = "A compact distributed operating system for building cross-platform distributed systems"; description = "A compact distributed operating system for building cross-platform distributed systems";
homepage = "http://inferno-os.org/"; homepage = "http://inferno-os.org/";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
maintainers = [ "Chris Double <chris.double@double.co.nz>" ]; maintainers = with stdenv.lib.maintainers; [ doublec kovirobi ];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
}; };
} }