From 22391994a334f79d2542b8a5596df7f3d112a51a Mon Sep 17 00:00:00 2001 From: Geir Okkenhaug Jerstad Date: Sun, 18 Aug 2024 11:55:13 +0200 Subject: [PATCH] adde Makefile --- tortoise/.direnv/flake-profile | 2 +- tortoise/.direnv/flake-profile-1-link | 1 - tortoise/.direnv/flake-profile-18-link | 1 + tortoise/flake.nix | 42 ++++++++++++++++--------- tortoise/tortoise | Bin 16072 -> 0 bytes tortoise/tortoise.c | 29 +++++++++++------ 6 files changed, 50 insertions(+), 25 deletions(-) delete mode 120000 tortoise/.direnv/flake-profile-1-link create mode 120000 tortoise/.direnv/flake-profile-18-link delete mode 100755 tortoise/tortoise diff --git a/tortoise/.direnv/flake-profile b/tortoise/.direnv/flake-profile index 0c05709..f9f4da1 120000 --- a/tortoise/.direnv/flake-profile +++ b/tortoise/.direnv/flake-profile @@ -1 +1 @@ -flake-profile-1-link \ No newline at end of file +flake-profile-18-link \ No newline at end of file diff --git a/tortoise/.direnv/flake-profile-1-link b/tortoise/.direnv/flake-profile-1-link deleted file mode 120000 index e583a7d..0000000 --- a/tortoise/.direnv/flake-profile-1-link +++ /dev/null @@ -1 +0,0 @@ -/nix/store/ml5jibqk9rhd8gfps532ry58njp2j5sd-nix-shell-env \ No newline at end of file diff --git a/tortoise/.direnv/flake-profile-18-link b/tortoise/.direnv/flake-profile-18-link new file mode 120000 index 0000000..60c8dcd --- /dev/null +++ b/tortoise/.direnv/flake-profile-18-link @@ -0,0 +1 @@ +/nix/store/d9kjbddwp2dsiwpvdvmaff9lpgy5rhsv-nix-shell-env \ No newline at end of file diff --git a/tortoise/flake.nix b/tortoise/flake.nix index 8f38de5..623929f 100644 --- a/tortoise/flake.nix +++ b/tortoise/flake.nix @@ -1,23 +1,37 @@ { - description = "A Nix-flake-based Guile development environment"; + description = "A Nix-flake-based C/C++ development environment"; + inputs.nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz"; outputs = { self, nixpkgs }: let - supportedSystems = - [ "x86_64-linux" ]; - forEachSupportedSystem = f: - nixpkgs.lib.genAttrs supportedSystems - (system: f { pkgs = import nixpkgs { inherit system; }; }); - in { + supportedSystems = [ "x86_64-linux" ]; + forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f { + pkgs = import nixpkgs { inherit system; }; + }); + in + { devShells = forEachSupportedSystem ({ pkgs }: { - default = pkgs.mkShell { - packages = with pkgs; [ - gnuplot - guile - gcc - ]; - }; + default = pkgs.mkShell.override + { + # Override stdenv in order to change compiler: + stdenv = pkgs.clangStdenv; + } + { + packages = with pkgs; [ + clang-tools + cmake + codespell + conan + cppcheck + doxygen + gtest + lcov + vcpkg + vcpkg-tool + ] ++ (if system == "aarch64-darwin" then [ ] else [ gdb ]); + }; }); }; } + diff --git a/tortoise/tortoise b/tortoise/tortoise deleted file mode 100755 index 1358568a836d009b9ace8c58332e41ba563926dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16072 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