Merge pull request #62992 from eraserhd/plan9port-enable-darwin-x11
plan9port: build everything on Darwin
This commit is contained in:
commit
21edffefc3
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||||||
--replace "case Kcmd+'v':" "case 0x16: case Kcmd+'v':"
|
--replace "case Kcmd+'v':" "case 0x16: case Kcmd+'v':"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [
|
buildInputs = [
|
||||||
which perl libX11 fontconfig xorgproto libXt libXext
|
which perl libX11 fontconfig xorgproto libXt libXext
|
||||||
freetype # fontsrv wants ft2build.h provides system fonts for acme and sam.
|
freetype # fontsrv wants ft2build.h provides system fonts for acme and sam.
|
||||||
];
|
];
|
||||||
@ -60,6 +60,27 @@ stdenv.mkDerivation rec {
|
|||||||
NIX_LDFLAGS="-lgcc_s";
|
NIX_LDFLAGS="-lgcc_s";
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
doInstallCheck = true;
|
||||||
|
installCheckPhase = ''
|
||||||
|
$out/bin/9 rc -c 'echo rc is working.'
|
||||||
|
|
||||||
|
# 9l can find and use its libs
|
||||||
|
cd $TMP
|
||||||
|
cat >test.c <<EOF
|
||||||
|
#include <u.h>
|
||||||
|
#include <libc.h>
|
||||||
|
#include <thread.h>
|
||||||
|
void
|
||||||
|
threadmain(int argc, char **argv)
|
||||||
|
{
|
||||||
|
threadexitsall(nil);
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
$out/bin/9 9c -o test.o test.c
|
||||||
|
$out/bin/9 9l -o test test.o
|
||||||
|
./test
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
homepage = https://9fans.github.io/plan9port/;
|
homepage = https://9fans.github.io/plan9port/;
|
||||||
description = "Plan 9 from User Space";
|
description = "Plan 9 from User Space";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user