From c8b88e2eb633331b0fd5a2de36e28ad9aa0d9a20 Mon Sep 17 00:00:00 2001 From: ChUrl Date: Tue, 19 Jul 2022 12:17:17 +0200 Subject: [PATCH] update flake --- flake.lock | 12 ++++++------ flake.nix | 16 +++++++++++----- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index b058f65..1e02df3 100755 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1656065134, - "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=", + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", "owner": "numtide", "repo": "flake-utils", - "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1656755932, - "narHash": "sha256-TGThfOxr+HjFK464+UoUE6rClp2cwxjiKvHcBVdIGSQ=", + "lastModified": 1658150454, + "narHash": "sha256-dhyOQvRT8oYWN0SwsNyujohBsJqwF5W7fnhEcfgBk7E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "660ac43ff9ab1f12e28bfb31d4719795777fe152", + "rev": "3110964916469ad6ed9fea72a0a3119a0959a14e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4d0ed9a..4b2ceb4 100755 --- a/flake.nix +++ b/flake.nix @@ -8,19 +8,25 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; in { + devShell = pkgs.mkShell { # Native inputs run on host nativeBuildInputs = with pkgs; [ - bashInteractive - gnumake - gcc + gcc_multi # Compile with 32bit glibc_multi nasm - qemu - gdb + binutils + gnumake bear # To generate compilation database +<<<<<<< Updated upstream clang-tools_14 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