1 files changed, 14 insertions, 8 deletions

diff --git a/flake.nix b/flake.nix
index 6756eed..2320882 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,21 +9,27 @@
       (system:
         let
           pkgs = import nixpkgs { inherit system; };
-          boost = pkgs.boost191;
-          llvmVersion = "22";
-          llvmPackages = pkgs."llvmPackages_${llvmVersion}";
-          libstdcxxGcc = pkgs.gcc16.cc;
-          clang = llvmPackages.clang.override {
+
+          llvmVersion = 22;
+          gccVersion = 16;
+          boostVersion = 191;
+
+          llvmPackages = pkgs."llvmPackages_${toString llvmVersion}";
+          libstdcxxGcc = pkgs."gcc${toString gccVersion}".cc;  # the unwrapped version!
+          stdenv = pkgs.stdenvAdapters.overrideCC llvmPackages.stdenv (llvmPackages.clang.override {
             gccForLibs = libstdcxxGcc;
-          };
-          inherit (clang) stdenv;
+          });
+          boost = pkgs."boost${toString boostVersion}";
 
           routemon = stdenv.mkDerivation {
             name = "routemon";
             src = ./server;
 
             buildInputs = with pkgs; [ boost pugixml expat icu openssl sqlite ];
-            nativeBuildInputs = with pkgs; [ pkgs."llvmPackages_${llvmVersion}".clang-tools pkgs."clang_${llvmVersion}" boost cmake ninja gettext ];
+            nativeBuildInputs = with pkgs; [
+              llvmPackages.clang-tools boost  # not from pkgs
+              cmake ninja gettext
+            ];
 
             hardeningDisable = [
               # Disable here because this breaks C++ modules (I suspect because it sets -D_FORTIFY_SOURCE=3)