ehmry/genode-oberon
ehmry
/
genode-oberon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Oberon core works

This commit is contained in:
Ehmry - 2019-11-22 18:54:56 +01:00
parent 1f8e5a6071
commit e702c47883
2 changed files with 125 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
flake.lock
View File

@ -23,14 +23,14 @@
"inputs": {
"nixpkgs": {
"inputs": {},
"narHash": "sha256-Y5ZOTgInrYYoas3vM8uTPLA2DvFI9YoI6haftIKl9go=",
"narHash": "sha256-HYX9rCn1dweN+L3ecNy4BiCGw4WEt1zgdIiAeYNY5GM=",
"originalUrl": "nixpkgs",
"url": "github:edolstra/nixpkgs/015c9ec3372e328ea6742b409a1e9aa26dab2b31"
"url": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode&rev=12e31ac07c6d337760b3f59dc64c03f26cdd2009"
}
},
"narHash": "sha256-bCKZSw8cBTJf5EPSXzuKPTaM8EAFXez27BCMZn+rUk0=",
"originalUrl": "genode-depot",
"url": "git+file:///home/repo/genode-depot?ref=master&rev=b9119fccb3114829900ae75886d3b5edb54bbd7f"
"narHash": "sha256-be9whulZ8unz1sq9PiFr+tuUAXlwiPEhIe0Z6jmfZiU=",
"originalUrl": "git+https://gitea.c3d2.de/ehmry/genode-depot.git",
"url": "git+https://gitea.c3d2.de/ehmry/genode-depot.git?ref=master&rev=2f3162d88220bd6fa6b6fbc7c6d9fed68533a761"
},
"genodepkgs": {
"inputs": {
@ -53,22 +53,119 @@
"originalUrl": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake",
"url": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake&rev=256810cd5adf1ae5862eed0ffdaab4cf49f6fe67"
},
"genode": {
"inputs": {
"nixpkgs": {
"inputs": {},
"narHash": "sha256-HYX9rCn1dweN+L3ecNy4BiCGw4WEt1zgdIiAeYNY5GM=",
"originalUrl": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode",
"url": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode&rev=12e31ac07c6d337760b3f59dc64c03f26cdd2009"
}
},
"narHash": "sha256-9/RR/CwvB1M2VSR7CrSVexYXN1YSSSE4WG4siDh0LE0=",
"originalUrl": "git+https://gitea.c3d2.de/ehmry/genode.git",
"url": "git+https://gitea.c3d2.de/ehmry/genode.git?ref=master&rev=2a9178fced42cac986de07b6944afd4422d28976"
},
"genode-depot": {
"inputs": {
"nixpkgs": {
"inputs": {},
"narHash": "sha256-HYX9rCn1dweN+L3ecNy4BiCGw4WEt1zgdIiAeYNY5GM=",
"originalUrl": "nixpkgs",
"url": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode&rev=12e31ac07c6d337760b3f59dc64c03f26cdd2009"
}
},
"narHash": "sha256-be9whulZ8unz1sq9PiFr+tuUAXlwiPEhIe0Z6jmfZiU=",
"originalUrl": "git+https://gitea.c3d2.de/ehmry/genode-depot.git",
"url": "git+https://gitea.c3d2.de/ehmry/genode-depot.git?ref=master&rev=2f3162d88220bd6fa6b6fbc7c6d9fed68533a761"
},
"nixpkgs": {
"inputs": {},
"narHash": "sha256-1pvSqpPbcREIGI7BF6A29b81bH/dZvywTPwYhrMaRa0=",
"originalUrl": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git",
"url": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=master&rev=ff59349d99ff0ff2496e85278c596df3a14ef3ec"
"narHash": "sha256-HYX9rCn1dweN+L3ecNy4BiCGw4WEt1zgdIiAeYNY5GM=",
"originalUrl": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode",
"url": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode&rev=12e31ac07c6d337760b3f59dc64c03f26cdd2009"
}
},
"narHash": "sha256-QTWywbGQT7FK6EpcbLicI3zrjNBc5f/6zp9OPMc8soI=",
"narHash": "sha256-aVnK41/uYBqDxNOZpaIwLICkrBp5qYN0gehqoOCpOcg=",
"originalUrl": "git+file:///home/repo/genodepkgs?ref=flake",
"url": "git+file:///home/repo/genodepkgs?ref=flake&rev=347b52e1b1484e3e812db9bc6279d2a22ab5aa18"
"url": "git+file:///home/repo/genodepkgs?ref=flake&rev=e92ee9b472fbc8238aa7b653eab28f50e46e0f25"
},
"libretro-genode": {
"inputs": {
"genodepkgs": {
"inputs": {
"dhall-haskell": {
"inputs": {
"nixpkgs": {
"inputs": {},
"narHash": "sha256-wJg4DA700SoQbEz61448sR6BgxRa1R92K3vvCV1g+HY=",
"originalUrl": "git+https://github.com/nixos/nixpkgs.git?ref=18.09-beta&rev=1d4de0d552ae9aa66a5b8dee5fb0650a4372d148",
"url": "git+https://github.com/nixos/nixpkgs.git?ref=18.09-beta&rev=1d4de0d552ae9aa66a5b8dee5fb0650a4372d148"
},
"nixpkgsStaticLinux": {
"inputs": {},
"narHash": "sha256-famU3pJZ4vkElV9qc71HmyRVSvcrAhfMZ0UJKpmmKP8=",
"originalUrl": "git+https://github.com/nh2/nixpkgs.git?ref=static-haskell-nix-stack-dhall-working",
"url": "git+https://github.com/nh2/nixpkgs.git?ref=static-haskell-nix-stack-dhall-working&rev=925aac04f4ca58aceb83beef18cb7dae0715421b"
}
},
"narHash": "sha256-NGbS2bymVuCQcanlBO41I6ZjSAZSLXhACK3qQU25zUs=",
"originalUrl": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake",
"url": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake&rev=256810cd5adf1ae5862eed0ffdaab4cf49f6fe67"
},
"genode": {
"inputs": {
"nixpkgs": {
"inputs": {},
"narHash": "sha256-HYX9rCn1dweN+L3ecNy4BiCGw4WEt1zgdIiAeYNY5GM=",
"originalUrl": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode",
"url": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode&rev=12e31ac07c6d337760b3f59dc64c03f26cdd2009"
}
},
"narHash": "sha256-9/RR/CwvB1M2VSR7CrSVexYXN1YSSSE4WG4siDh0LE0=",
"originalUrl": "git+https://gitea.c3d2.de/ehmry/genode.git",
"url": "git+https://gitea.c3d2.de/ehmry/genode.git?ref=master&rev=2a9178fced42cac986de07b6944afd4422d28976"
},
"genode-depot": {
"inputs": {
"nixpkgs": {
"inputs": {},
"narHash": "sha256-HYX9rCn1dweN+L3ecNy4BiCGw4WEt1zgdIiAeYNY5GM=",
"originalUrl": "nixpkgs",
"url": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode&rev=12e31ac07c6d337760b3f59dc64c03f26cdd2009"
}
},
"narHash": "sha256-be9whulZ8unz1sq9PiFr+tuUAXlwiPEhIe0Z6jmfZiU=",
"originalUrl": "git+https://gitea.c3d2.de/ehmry/genode-depot.git",
"url": "git+https://gitea.c3d2.de/ehmry/genode-depot.git?ref=master&rev=2f3162d88220bd6fa6b6fbc7c6d9fed68533a761"
},
"nixpkgs": {
"inputs": {},
"narHash": "sha256-HYX9rCn1dweN+L3ecNy4BiCGw4WEt1zgdIiAeYNY5GM=",
"originalUrl": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode",
"url": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode&rev=12e31ac07c6d337760b3f59dc64c03f26cdd2009"
}
},
"narHash": "sha256-aVnK41/uYBqDxNOZpaIwLICkrBp5qYN0gehqoOCpOcg=",
"originalUrl": "git+file:///home/repo/genodepkgs?ref=flake",
"url": "git+file:///home/repo/genodepkgs?ref=flake&rev=e92ee9b472fbc8238aa7b653eab28f50e46e0f25"
},
"nixpkgs": {
"inputs": {},
"narHash": "sha256-HYX9rCn1dweN+L3ecNy4BiCGw4WEt1zgdIiAeYNY5GM=",
"originalUrl": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode",
"url": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode&rev=12e31ac07c6d337760b3f59dc64c03f26cdd2009"
}
},
"narHash": "sha256-Oi/CX5bd1XqJ6syuXd9SefgBdQ0NmsXSYOAm4yh9uRM=",
"originalUrl": "git+file:///home/repo/libretro-genode",
"url": "git+file:///home/repo/libretro-genode?ref=master&rev=57d85cc46ccd278f9145eb3a16e31aa088359892"
},
"nixpkgs": {
"inputs": {},
"narHash": "sha256-1pvSqpPbcREIGI7BF6A29b81bH/dZvywTPwYhrMaRa0=",
"originalUrl": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git",
"url": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=master&rev=ff59349d99ff0ff2496e85278c596df3a14ef3ec"
"narHash": "sha256-HYX9rCn1dweN+L3ecNy4BiCGw4WEt1zgdIiAeYNY5GM=",
"originalUrl": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode",
"url": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=genode&rev=12e31ac07c6d337760b3f59dc64c03f26cdd2009"
}
},
"version": 3

43
flake.nix
View File

@ -4,7 +4,8 @@
description = "Genode desktop varaint";
inputs = {
dhall-haskell.uri = "git+https://github.com/dhall-lang/dhall-haskell?ref=flake";
dhall-haskell.uri =
"git+https://github.com/dhall-lang/dhall-haskell?ref=flake";
genode-depot.uri = "git+https://gitea.c3d2.de/ehmry/genode-depot.git";
genodepkgs.url = "git+file:///home/repo/genodepkgs?ref=flake";
libretro-genode.uri = "git+file:///home/repo/libretro-genode";
@ -17,8 +18,7 @@
lib = import (genodepkgs + "/lib") {
inherit genodepkgs nixpkgs dhall-haskell genode-depot;
};
dummyXml = builtins.toFile "empty.xml" "<empty/>";
# Hack to break off the stupid "capslock" shit
pleaseNo = builtins.toFile "empty.xml" "<empty/>";
in {
packages.x86_64-genode.iso = with genodepkgs.packages.x86_64-genode;
@ -30,50 +30,37 @@
libretro = libretro-genode.packages.x86_64-genode;
in {
config = lib.renderDhallInit ./config.dhall "{=}";
"Oberon.dsk" =
"${libretro.oberon.smSrc}/DiskImage/Oberon-2019-01-21.dsk";
"libm.lib.so" = "${depot.libc}/lib/libm.lib.so";
"libc.lib.so" = "${depot.libc}/lib/libc.lib.so";
"libretro.so" =
./libretro.so;
# "${libretro.oberon}/bin/oberon/libretro.so";
retro_frontend =
./retro_frontend;
# "${libretro.retro_frontend}/bin/retro_frontend/retro_frontend";
acpi_drv = "${os}/bin/acpi_drv";
ahci_drv = "${os}/bin/ahci_drv";
vesa_fb_drv = "${depot.vesa_drv}/bin/vesa_fb_drv";
capslock = pleaseNo;
driver_manager = "${depot.driver_manager}/bin/driver_manager";
"drivers.config" = ./drivers.config;
"empty_runtime.config" =
"${upstream}/repos/gems/run/sculpt/empty_runtime.config";
"en_us.chargen" =
"${upstream}/repos/os/src/server/input_filter/en_us.chargen";
"fb_drv.config" =
"${upstream}/repos/os/recipes/raw/drivers_interactive-pc/fb_drv.config";
"fonts.config" = "${upstream}/repos/gems/run/sculpt/fonts.config";
fs_report = "${os}/bin/fs_report";
fs_rom = "${os}/bin/fs_rom";
"input_filter.config" = ./input_filter.config;
input_filter = "${os}/bin/input_filter";
"libc.lib.so" = "${depot.libc}/lib/libc.lib.so";
"libm.lib.so" = "${depot.libc}/lib/libm.lib.so";
"libretro.so" = "${libretro.oberon}/bin/oberon/libretro.so";
log_core = "${os}/bin/log_core";
nitpicker = "${os}/bin/nitpicker";
numlock = pleaseNo;
"Oberon.dsk" =
"${libretro.oberon.smSrc}/DiskImage/Oberon-2019-01-21.dsk";
platform_drv = "${os}/bin/platform_drv";
pointer = "${os}/bin/pointer";
ps2_drv = "${os}/bin/ps2_drv";
ram_fs = "${os}/bin/ram_fs";
report_rom = "${os}/bin/report_rom";
rom_filter = "${os}/bin/rom_filter";
rom_reporter = "${os}/bin/rom_reporter";
terminal_log = "${os}/bin/terminal_log";
"usb.config" = pleaseNo;
usb_drv = "${depot.usb_drv}/bin/usb_drv";
vfs = "${os}/bin/vfs";
"vfs_import.lib.so" = "${depot.vfs_import}/lib/vfs_import.lib.so";
usb_policy = pleaseNo;
vesa_fb_drv = "${depot.vesa_drv}/bin/vesa_fb_drv";
"vfs.lib.so" = "${os}/lib/vfs.lib.so";
capslock = dummyXml;
numlock = dummyXml;
usb_policy = dummyXml;
"usb.config" = dummyXml;
vfs = "${os}/bin/vfs";
};
};