christoph/lecture-operating-system-development
1
Fork 0
Code Activity

update flake

Browse Source
This commit is contained in:
Christoph Urlacher
2022-07-19 12:17:17 +02:00
parent 885eecf468
commit c8b88e2eb6
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock generated
View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1656065134, "lastModified": 1656928814,
"narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=", "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c", "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1656755932, "lastModified": 1658150454,
"narHash": "sha256-TGThfOxr+HjFK464+UoUE6rClp2cwxjiKvHcBVdIGSQ=", "narHash": "sha256-dhyOQvRT8oYWN0SwsNyujohBsJqwF5W7fnhEcfgBk7E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "660ac43ff9ab1f12e28bfb31d4719795777fe152", "rev": "3110964916469ad6ed9fea72a0a3119a0959a14e",
"type": "github" "type": "github"
}, },
"original": { "original": {

16
flake.nix
View File

@ -8,19 +8,25 @@
flake-utils.lib.eachDefaultSystem (system: flake-utils.lib.eachDefaultSystem (system:
let pkgs = nixpkgs.legacyPackages.${system}; let pkgs = nixpkgs.legacyPackages.${system};
in { in {
devShell = pkgs.mkShell { devShell = pkgs.mkShell {
# Native inputs run on host # Native inputs run on host
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
bashInteractive gcc_multi # Compile with 32bit
gnumake
gcc
glibc_multi glibc_multi
nasm nasm
qemu binutils
gdb gnumake
bear # To generate compilation database bear # To generate compilation database
<<<<<<< Updated upstream
clang-tools_14 clang-tools_14
cling # To try out my bullshit implementations cling # To try out my bullshit implementations
=======
gdb
qemu # Start os in virtual machine
clang-tools_14 # Editor LSP
# cling # To try out my bullshit implementations
>>>>>>> Stashed changes
]; ];
# Build inputs are for target platform, app will be linked against those # Build inputs are for target platform, app will be linked against those