ehmry/genodepkgs
ehmry
/
genodepkgs
2
0
Fork 0
Code Releases Activity

fuck this mess

This commit is contained in:
Ehmry - 2020-05-25 19:25:08 +05:30
parent 3ca84edf05
commit f6c6394516
5 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos-modules/default.nix
View File

@ -66,7 +66,7 @@ let
"stdcxx" "stdcxx"
"terminal" "terminal"
"terminal_log" "terminal_log"
"vbox5" "vbox5-nova"
"intel_fb_drv" "intel_fb_drv"
"vfs" "vfs"
"vfs_audit" "vfs_audit"

2
nixos-modules/dhall/simple.dhall
View File

@ -369,7 +369,7 @@ let rootInit =
in Child.flat in Child.flat
Child.Attributes::{ Child.Attributes::{
, binary = "virtualbox5" , binary = "virtualbox5-nova"
, config = Init.Config::{ , config = Init.Config::{
, attributes = toMap , attributes = toMap
{ vbox_file = "machine.vbox" { vbox_file = "machine.vbox"

3
packages/genodelabs/default.nix
View File

@ -63,7 +63,8 @@ let
preparePort = name: preparePort = name:
{ hash ? "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" { hash ? "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
, patches ? [ ], ... }@args: , patches ? [ ], ... }@args:
let havePatches = patches != [ ]; let
havePatches = patches != [ ];
version = builtins.getAttr name (import "${genodeSources}/ports.nix"); version = builtins.getAttr name (import "${genodeSources}/ports.nix");
in stdenvNoCC.mkDerivation (args // { in stdenvNoCC.mkDerivation (args // {
name = name + "-port-" + version; name = name + "-port-" + version;

6
packages/genodelabs/ports.nix
View File

@ -3,7 +3,7 @@
with buildPackages; { with buildPackages; {
dde_bsd.hash = "sha256-2ilZs6JkcQAvU/sQYnHunGtGRZDt7qLTpKZxQxSOf2I="; dde_bsd.hash = "sha256-2ilZs6JkcQAvU/sQYnHunGtGRZDt7qLTpKZxQxSOf2I=";
dde_ipxe.hash = "sha256-NJ129+DkxFg1fFHJBABBFRRjqEVNSz6v2hEB80AuEM4="; dde_ipxe.hash = "sha256-NJ129+DkxFg1fFHJBABBFRRjqEVNSz6v2hEB80AuEM4=";
dde_linux.hash = "sha256-3G5Mprv9ZBNhDJRuVF6Nrkp3KbFaN10IKFq0OdyAY9M="; dde_linux.hash = "sha256-aUp90z8dtn48QNUqGe1b08RzbESFmCJl7ECZf+lr0rg=";
dde_rump = { dde_rump = {
hash = "sha256-Wr5otGkWEa+5xImsFHQzwap5LckNEbyWA/7xbNcOreI="; hash = "sha256-Wr5otGkWEa+5xImsFHQzwap5LckNEbyWA/7xbNcOreI=";
nativeBuildInputs = [ subversion ]; nativeBuildInputs = [ subversion ];
@ -13,7 +13,7 @@ with buildPackages; {
jitterentropy.hash = "sha256-6KS732GxtUMz0xPYKtshdn039DgdJq11vTDQesZn4Ds="; jitterentropy.hash = "sha256-6KS732GxtUMz0xPYKtshdn039DgdJq11vTDQesZn4Ds=";
jpeg.hash = "sha256-RLVnlrnYGrhqr3Feikoi/BNditCaKN0u3t9/UDpl2wQ="; jpeg.hash = "sha256-RLVnlrnYGrhqr3Feikoi/BNditCaKN0u3t9/UDpl2wQ=";
libc = { libc = {
hash = "sha256-RL5l7GHlczc/6Uils9WCuPh9cCawx6XZ4H0HLPdMmAA="; hash = "sha256-V0gkHLf0TCjFHdyRN7F/7fekz+UwSsV0b2HAAp4iQvo=";
nativeBuildInputs = [ buildPackages.gcc subversion ]; nativeBuildInputs = [ buildPackages.gcc subversion ];
}; };
libiconv.hash = "sha256-25YcW5zo1fE33ZolGQroR+KZO8wHEdN1QXa7+MhwS78="; libiconv.hash = "sha256-25YcW5zo1fE33ZolGQroR+KZO8wHEdN1QXa7+MhwS78=";
@ -35,7 +35,7 @@ with buildPackages; {
stb.hash = "sha256-9LSH1i8jcEvjRAmTvgtK+Axy9hO7uiSzmSgBvs0zkTc="; stb.hash = "sha256-9LSH1i8jcEvjRAmTvgtK+Axy9hO7uiSzmSgBvs0zkTc=";
stdcxx.hash = "sha256-iiE009fL1yE3XJ7HkaJakOiS++m7qONwwGrdJjBXQ7k="; stdcxx.hash = "sha256-iiE009fL1yE3XJ7HkaJakOiS++m7qONwwGrdJjBXQ7k=";
virtualbox5 = { virtualbox5 = {
hash = "sha256-qTdaJX8plHJV9z5MN68gFwGNhcGFu3f2WwkVkBGu/ck="; hash = "sha256-mzn+cV/PriEMQV+m45e2n9w5piogmavc1qgxJVDgqQg=";
nativeBuildInputs = [ iasl libxslt unzip yasm ]; nativeBuildInputs = [ iasl libxslt unzip yasm ];
patches = [ ./vbox5-iasl.patch ./vbox_main.patch.patch ]; patches = [ ./vbox5-iasl.patch ./vbox_main.patch.patch ];
}; };

25
packages/genodelabs/targets.nix
View File

@ -1,5 +1,16 @@
{ buildPackages, ports }: { buildPackages, ports }:
with ports; { with ports;
let
vbox' = {
nativeBuildInputs = with buildPackages; [ iasl yasm ];
patches = [
./vbox5-iasl.patch
./vbox-framebuffer-fail-on-fail.patch
./vbox-debug.patch
];
portInputs = [ libc libiconv qemu-usb stdcxx virtualbox5 ];
};
in {
gpt_write.portInputs = [ jitterentropy ]; gpt_write.portInputs = [ jitterentropy ];
@ -47,17 +58,9 @@ with ports; {
usb_drv.portInputs = [ dde_linux ]; usb_drv.portInputs = [ dde_linux ];
vbox5 = { vbox5 = vbox';
nativeBuildInputs = with buildPackages; [ iasl yasm ];
patches = [ ./vbox5-iasl.patch ./vbox-framebuffer-fail-on-fail.patch ./vbox-debug.patch ];
portInputs = [ libc libiconv qemu-usb stdcxx virtualbox5 ];
};
vbox5-nova = { vbox5-nova = vbox';
nativeBuildInputs = with buildPackages; [ iasl yasm ];
patches = [ ./vbox5-iasl.patch ./vbox-framebuffer-fail-on-fail.patch ];
portInputs = [ libc libiconv qemu-usb stdcxx virtualbox5 ];
};
vesa_drv.portInputs = [ libc x86emu ]; vesa_drv.portInputs = [ libc x86emu ];