From 0c6027cae2071bd8a57ff8a748373b946ba7ff96 Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Mon, 30 Jun 2025 21:13:58 +0200 Subject: [PATCH] Update environment --- .gitignore | 1 + compile_commands.json | 2 +- flake.lock | 100 ++++------------ flake.nix | 265 +++++++++++++++++++++++++++++++++--------- 4 files changed, 239 insertions(+), 129 deletions(-) diff --git a/.gitignore b/.gitignore index 5b46c59..687d7bd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ cmake-build-debug cmake-build-release .cache/clangd/index +result diff --git a/compile_commands.json b/compile_commands.json index 66636ac..fd9db9d 120000 --- a/compile_commands.json +++ b/compile_commands.json @@ -1 +1 @@ -./cmake-build-debug/compile_commands.json \ No newline at end of file +./cmake-build-release/compile_commands.json \ No newline at end of file diff --git a/flake.lock b/flake.lock index 1611c4f..b63c567 100644 --- a/flake.lock +++ b/flake.lock @@ -1,52 +1,15 @@ { "nodes": { - "devshell": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", - "owner": "numtide", - "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -57,59 +20,46 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704161960, - "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", + "lastModified": 1751180975, + "narHash": "sha256-BKk4yDiXr4LdF80OTVqYJ53Q74rOcA/82EClXug8xsY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63143ac2c9186be6d9da6035fa22620018c85932", + "rev": "a48741b083d4f36dd79abd9f760c84da6b4dc0e5", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1717112898, - "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "root": { "inputs": { - "devshell": "devshell", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" } }, - "systems": { + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "lastModified": 1751251399, + "narHash": "sha256-y+viCuy/eKKpkX1K2gDvXIJI/yzvy6zA3HObapz9XZ0=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "b22d5ee8c60ed1291521f2dde48784edd6bf695b", "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", + "owner": "oxalica", + "repo": "rust-overlay", "type": "github" } }, - "systems_2": { + "systems": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index 4346354..ee4dfee 100644 --- a/flake.nix +++ b/flake.nix @@ -1,88 +1,247 @@ -{ - description = "C/C++ Environment"; +rec { + description = "C++ Brainfuck Interpreter"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.devshell.url = "github:numtide/devshell"; + inputs = { + nixpkgs.url = "nixpkgs"; # Use nixpkgs from system registry + flake-utils.url = "github:numtide/flake-utils"; + + rust-overlay.url = "github:oxalica/rust-overlay"; + rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; + }; outputs = { self, nixpkgs, flake-utils, - devshell, + rust-overlay, }: + # Create a shell (and possibly package) for each possible system, not only x86_64-linux flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; - config.allowUnfree = true; # For clion - overlays = [devshell.overlays.default]; + config.allowUnfree = true; + overlays = [ + rust-overlay.overlays.default + ]; + }; + inherit (pkgs) lib stdenv; + + # =========================================================================================== + # Define custom dependencies + # =========================================================================================== + + python = pkgs.python313.withPackages (p: + with p; [ + pyside6 + ffmpeg-python + matplotlib + numpy + ]); + + rust = pkgs.rust-bin.stable.latest.default.override { + extensions = ["rust-src"]; # Include the Rust stdlib source (for IntelliJ) }; - # NOTE: Usual 64 bit compilers that don't collide + # 64 bit C/C++ compilers that don't collide (use the same libc) bintools = pkgs.wrapBintoolsWith { - bintools = pkgs.bintools.bintools; + bintools = pkgs.bintools.bintools; # Unwrapped bintools libc = pkgs.glibc; }; - gcc13 = pkgs.hiPrio (pkgs.wrapCCWith { - cc = pkgs.gcc13.cc; + gcc = pkgs.hiPrio (pkgs.wrapCCWith { + cc = pkgs.gcc.cc; # Unwrapped gcc libc = pkgs.glibc; bintools = bintools; }); - clang16 = pkgs.wrapCCWith { - cc = pkgs.clang_16.cc; + clang = pkgs.wrapCCWith { + cc = pkgs.clang.cc; # Unwrapped clang libc = pkgs.glibc; bintools = bintools; }; - # NOTE: Multilib compilers that don't collide - bintools_multi = pkgs.wrapBintoolsWith { - bintools = pkgs.bintools.bintools; # Get the unwrapped bintools from the wrapper + # Multilib C/C++ compilers that don't collide (use the same libc) + bintools_multilib = pkgs.wrapBintoolsWith { + bintools = pkgs.bintools.bintools; # Unwrapped bintools libc = pkgs.glibc_multi; }; - gcc13_multi = pkgs.hiPrio (pkgs.wrapCCWith { - cc = pkgs.gcc13.cc; # Get the unwrapped gcc from the wrapper + gcc_multilib = pkgs.hiPrio (pkgs.wrapCCWith { + cc = pkgs.gcc.cc; # Unwrapped gcc libc = pkgs.glibc_multi; - bintools = bintools_multi; + bintools = bintools_multilib; }); - clang16_multi = pkgs.wrapCCWith { - cc = pkgs.clang_16.cc; + clang_multilib = pkgs.wrapCCWith { + cc = pkgs.clang.cc; # Unwrapped clang libc = pkgs.glibc_multi; - bintools = bintools_multi; + bintools = bintools_multilib; }; - in { - # devShell = pkgs.devshell.mkShell ... - devShell = pkgs.devshell.mkShell { - name = "C/C++ Environment"; - packages = with pkgs; [ - # Compilers - bintools - gcc13 - clang16 - # bintools_multi - # gcc13_multi - # clang15_multi + # =========================================================================================== + # Specify dependencies + # https://nixos.org/manual/nixpkgs/stable/#ssec-stdenv-dependencies-overview + # Just for a "nix develop" shell, buildInputs can be used for everything. + # =========================================================================================== - # Native buildinputs - gnumake - cmake - # nasm + # Add dependencies to nativeBuildInputs if they are executed during the build: + # - Those which are needed on $PATH during the build, for example cmake and pkg-config + # - Setup hooks, for example makeWrapper + # - Interpreters needed by patchShebangs for build scripts (with the --build flag), which can be the case for e.g. perl + nativeBuildInputs = with pkgs; [ + # Languages: + # python + # rust + bintools + gcc + clang + # bintools_multilib + # gcc_multilib + # clang_multilib - # Development - # bear # To generate compilation database - gdb - cling # To try out my bullshit implementations - clang-tools_18 - # doxygen # Generate docs + graphs - ]; + # C/C++: + gdb + valgrind + gnumake + cmake + # pkg-config - commands = [ - # { - # name = "ide"; - # help = "Run clion for project"; - # command = "clion &>/dev/null ./ &"; - # } - ]; + # Qt: + # qt6.wrapQtAppsHook # For the shellHook + ]; + + # Add dependencies to buildInputs if they will end up copied or linked into the final output or otherwise used at runtime: + # - Libraries used by compilers, for example zlib + # - Interpreters needed by patchShebangs for scripts which are installed, which can be the case for e.g. perl + buildInputs = with pkgs; [ + # C/C++: + # boost + # sfml + + # Qt: + # qt6.qtbase + # qt6.full + ]; + + # =========================================================================================== + # Define buildable + installable packages + # =========================================================================================== + + package = stdenv.mkDerivation { + inherit nativeBuildInputs buildInputs; + pname = "bfuck"; + version = "1.0.0"; + src = ./.; + + installPhase = '' + mkdir -p $out/bin + mv ./bfuck $out/bin + ''; + }; + in rec { + # Provide package for "nix build" + defaultPackage = package; + defaultApp = flake-utils.lib.mkApp { + drv = defaultPackage; + }; + + # Provide environment for "nix develop" + devShell = pkgs.mkShell { + inherit nativeBuildInputs buildInputs; + name = description; + + # ========================================================================================= + # Define environment variables + # ========================================================================================= + + # Rust stdlib source: + # RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library"; + + # Custom dynamic libraries: + # LD_LIBRARY_PATH = builtins.concatStringsSep ":" [ + # # Rust Bevy GUI app + # "${pkgs.xorg.libX11}/lib" + # "${pkgs.xorg.libXcursor}/lib" + # "${pkgs.xorg.libXrandr}/lib" + # "${pkgs.xorg.libXi}/lib" + # "${pkgs.libGL}/lib" + # ]; + + # Dynamic libraries from buildinputs: + # LD_LIBRARY_PATH = nixpkgs.lib.makeLibraryPath buildInputs; + + # ========================================================================================= + # Define shell environment + # ========================================================================================= + + # Setup the shell when entering the "nix develop" environment (bash script). + shellHook = let + mkCmakeScript = type: let + typeLower = lib.toLower type; + in + pkgs.writers.writeFish "cmake-${typeLower}.fish" '' + cd $FLAKE_PROJECT_ROOT + + echo "Removing build directory ./cmake-build-${typeLower}/" + rm -rf ./cmake-build-${typeLower} + + echo "Creating build directory" + mkdir cmake-build-${typeLower} + cd cmake-build-${typeLower} + + echo "Running cmake" + cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE="${type}" -DCMAKE_EXPORT_COMPILE_COMMANDS="On" .. + + echo "Linking compile_commands.json" + cd .. + ln -sf ./cmake-build-${typeLower}/compile_commands.json ./compile_commands.json + ''; + + cmakeDebug = mkCmakeScript "Debug"; + cmakeRelease = mkCmakeScript "Release"; + + mkBuildScript = type: let + typeLower = lib.toLower type; + in + pkgs.writers.writeFish "cmake-build.fish" '' + cd $FLAKE_PROJECT_ROOT/cmake-build-${typeLower} + + echo "Running cmake" + cmake --build . + ''; + + buildDebug = mkBuildScript "Debug"; + buildRelease = mkBuildScript "Release"; + + # Use this to specify commands that should be ran after entering fish shell + initProjectShell = pkgs.writers.writeFish "init-shell.fish" '' + echo "Entering \"${description}\" environment..." + + # Determine the project root, used e.g. in cmake scripts + set -g -x FLAKE_PROJECT_ROOT (git rev-parse --show-toplevel) + + # Build the provided NixOS package + abbr -a build "nix build -L" + + # Rust Bevy: + # abbr -a build-release-windows "CARGO_FEATURE_PURE=1 cargo xwin build --release --target x86_64-pc-windows-msvc" + + # C/C++: + abbr -a cmake-debug "${cmakeDebug}" + abbr -a cmake-release "${cmakeRelease}" + abbr -a build-debug "${buildDebug}" + abbr -a build-release "${buildRelease}" + ''; + in + builtins.concatStringsSep "\n" [ + # Launch into pure fish shell + '' + exec "$(type -p fish)" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'" + '' + + # Qt: Launch into wrapped fish shell + # '' + # fishdir=$(mktemp -d) + # makeWrapper "$(type -p fish)" "$fishdir/fish" "''${qtWrapperArgs[@]}" + # exec "$fishdir/fish" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'" + # '' + ]; }; }); }