From 69089172371d503b8e4e1123f78a18538f0d3ace Mon Sep 17 00:00:00 2001 From: Alwin Berger Date: Mon, 5 Dec 2022 10:52:05 +0100 Subject: [PATCH] working flake --- flake.lock | 30 +++++++++++++++--------------- flake.nix | 11 ++++++++++- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 592677b..f3b58aa 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1637014545, - "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -32,11 +32,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1641230035, - "narHash": "sha256-hFyqihERaTbLxCOlugy/rpp22VLtLh8SPRnA2uu3F/8=", + "lastModified": 1667050928, + "narHash": "sha256-xOn0ZgjImIyeecEsrjxuvlW7IW5genTwvvnDQRFncB8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "78cd22c1b8604de423546cd49bfe264b786eca13", + "rev": "fdebb81f45a1ba2c4afca5fd9f526e1653ad0949", "type": "github" }, "original": { @@ -48,11 +48,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1637453606, - "narHash": "sha256-Gy6cwUswft9xqsjWxFYEnx/63/qzaFUwatcbV5GF/GQ=", + "lastModified": 1665296151, + "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8afc4e543663ca0a6a4f496262cd05233737e732", + "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", "type": "github" }, "original": { @@ -75,11 +75,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1641177598, - "narHash": "sha256-ixQ72QmhIfb7bAzvLUn6GtjpoMA/N3V1PBwjZQQyc1k=", + "lastModified": 1667184938, + "narHash": "sha256-/kuCiXuAxiD0c0zrfDvJ1Yba3FuVdRk/ROfb393AeX4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d93e905bc0d36508590b6ec0e2e6e92d2cf8289a", + "rev": "8f81faec35508647ced65c44fd3e8648a5518afb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 885362e..daa8504 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ inherit system overlays; }; myrust = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override { - extensions = [ "rls" "rust-analysis" "rust-src" "rust-docs" ]; + extensions = [ "rust-analyzer" "rust-src" "rust-docs" ]; }); in with pkgs; @@ -24,12 +24,15 @@ buildInputs = [ # rust-bin.nightly.latest.default myrust + llvmPackages_14.libclang # für qemu python3 + meson # unsure ninja pkgconfig glib pixman + # libslirp # für analyse der in-/outputs xxd # FreeRTOS @@ -47,6 +50,12 @@ ]; shellHook = '' + export CUSTOM_QEMU_DIR=/home/alwin/code/FRET/qemu-libafl-bridge + export CUSTOM_QEMU_NO_BUILD=1 + # export EMULATION_MODE=systemmode + # export CPU_TARGET=arm + # export CROSS_CC=arm-none-eabi-gcc + export LIBCLANG_PATH=${llvmPackages_14.libclang.lib}/lib ''; };