Compare commits
2 Commits
459791a595
...
86a60110c2
| Author | SHA1 | Date | |
|---|---|---|---|
|
86a60110c2
|
|||
|
6f60ba10e3
|
@@ -50,8 +50,6 @@
|
|||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
libxcb
|
libxcb
|
||||||
xcbutilwm
|
xcbutilwm
|
||||||
xrandr
|
|
||||||
xprop
|
|
||||||
ocamlPackages.ctypes
|
ocamlPackages.ctypes
|
||||||
ocamlPackages.ctypes-foreign
|
ocamlPackages.ctypes-foreign
|
||||||
mruby
|
mruby
|
||||||
@@ -76,6 +74,32 @@
|
|||||||
mruby = mruby;
|
mruby = mruby;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
apps.${system}.default = {
|
||||||
|
type = "app";
|
||||||
|
program = "${pkgs.writeShellScript "kutu-run" ''
|
||||||
|
set -e
|
||||||
|
if [ -z "$DISPLAY" ]; then
|
||||||
|
exec ${pkgs.xinit}/bin/startx \
|
||||||
|
${kutu}/bin/kutu \
|
||||||
|
-- \
|
||||||
|
${pkgs.xorg-server}/bin/X
|
||||||
|
else
|
||||||
|
DISPLAY_NUM=:100
|
||||||
|
${pkgs.xorg-server}/bin/Xephyr \
|
||||||
|
$DISPLAY_NUM \
|
||||||
|
-screen 1280x720 \
|
||||||
|
-ac \
|
||||||
|
> /tmp/kutu-xephyr.log 2>&1 &
|
||||||
|
XEPHYR_PID=$!
|
||||||
|
cleanup() { kill "$XEPHYR_PID" 2>/dev/null || true; }
|
||||||
|
trap cleanup EXIT INT TERM
|
||||||
|
sleep 1
|
||||||
|
DISPLAY=$DISPLAY_NUM ${kutu}/bin/kutu
|
||||||
|
echo "Returned: $?"
|
||||||
|
fi
|
||||||
|
''}";
|
||||||
|
};
|
||||||
|
|
||||||
devShells.${system}.default = pkgs.mkShell {
|
devShells.${system}.default = pkgs.mkShell {
|
||||||
inputsFrom = [ kutu ];
|
inputsFrom = [ kutu ];
|
||||||
|
|
||||||
|
|||||||
@@ -6,4 +6,7 @@
|
|||||||
-cclib -L%{env:MRUBY_LIB=../libs/mruby/build/host/lib}
|
-cclib -L%{env:MRUBY_LIB=../libs/mruby/build/host/lib}
|
||||||
-cclib -Wl,--whole-archive
|
-cclib -Wl,--whole-archive
|
||||||
-cclib -lmruby
|
-cclib -lmruby
|
||||||
-cclib -Wl,--no-whole-archive))
|
-cclib -Wl,--no-whole-archive
|
||||||
|
-cclib -lxcb
|
||||||
|
-cclib -lxcb-icccm
|
||||||
|
-cclib -lxcb-randr))
|
||||||
|
|||||||
Reference in New Issue
Block a user