Add enableDebug option to all derivations

NilFoundation · Jun 3, 2024 · 4eac200 · 4eac200
1 parent 748620c
commit 4eac200
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/nix/evmc/evmc.nix b/nix/evmc/evmc.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, fetchFromGitHub }:
+{ pkgs, stdenv, fetchFromGitHub, enableDebug ? true }:
 
 stdenv.mkDerivation rec {
   name = "evmc";
@@ -12,10 +12,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgs.cmake ];
 
-  cmakeFlags = [
-    "-DEVMC_TOOLS=FALSE"
-  ];
+  cmakeBuildType = if enableDebug then "Debug" else "Release";
 
   doCheck = true;
-  dontStrip = true;
+  dontStrip = enableDebug;
 }
diff --git a/nix/hashtree/hashtree.nix b/nix/hashtree/hashtree.nix
@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , fetchpatch
 , automake
+, enableDebug ? false
 }:
 
 let
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-no-integrated-as -std=c2x";
 
   doCheck = true;
-  dontStrip = true;
+  dontStrip = enableDebug;
 
   nativeBuildInputs = [
     automake

diff --git a/nix/intx/intx.nix b/nix/intx/intx.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgs }:
+{ lib, stdenv, fetchFromGitHub, pkgs, enableDebug ? false }:
 
 stdenv.mkDerivation rec {
   name = "intx";
@@ -13,5 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgs.cmake ];
 
+  cmakeBuildType = if enableDebug then "Debug" else "Release";
+
   cmakeFlags = [ "-DINTX_TESTING=OFF" ];
 }
diff --git a/nix/sszpp/sszpp.nix b/nix/sszpp/sszpp.nix
@@ -5,6 +5,7 @@
 , cmake
 , intx
 , hashtree
+, enableDebug ? false
 }:
 
 let
@@ -24,13 +25,14 @@ stdenv.mkDerivation rec {
   outputs = [ "out" ];
 
   doCheck = true;
-  dontStrip = true;
   env.NIX_CFLAGS_COMPILE = "-Wno-error=format-security -Wno-defaulted-function-deleted -Wno-unneeded-internal-declaration -Wno-logical-op-parentheses";
 
   cmakeFlags = [
     "-DCMAKE_CXX_STANDARD=23"
   ];
 
+  cmakeBuildType = if enableDebug then "Debug" else "Release";
+
   patches = [
     ./sszpp-merkleize-remove.patch
   ];
@@ -40,8 +42,8 @@ stdenv.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
-    intx
-    hashtree
+    (intx.override { inherit enableDebug; })
+    (hashtree.override { inherit enableDebug; })
   ];
 
   meta = with lib; {