flake

2022-07-19 12:18:56 +02:00
parent c8b88e2eb6
commit 84d170cc97
1 changed files with 0 additions and 5 deletions
--- a/flake.nix
+++ b/flake.nix
@ -18,15 +18,10 @@
            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