From 4316e7b12d29cf5ebe937550b35ad56b86fab237 Mon Sep 17 00:00:00 2001
From: Aleix Roca Nonell <aleix.rocanonell@bsc.es>
Date: Mon, 20 Nov 2023 15:43:29 +0100
Subject: [PATCH] Enable separatedebuginfo for common BSC packages

For now, we keep dontStrip for packages that already had it for systems
without the separatedebuginfo support.

Reviewed-By: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Tested-By: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
---
 pkgs/nanos6/default.nix  | 1 +
 pkgs/nodes/default.nix   | 1 +
 pkgs/nosv/default.nix    | 1 +
 pkgs/ovni/default.nix    | 3 ++-
 pkgs/tagaspi/default.nix | 1 +
 pkgs/tampi/default.nix   | 1 +
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/nanos6/default.nix b/pkgs/nanos6/default.nix
index 4bad276..bd0f10a 100644
--- a/pkgs/nanos6/default.nix
+++ b/pkgs/nanos6/default.nix
@@ -87,6 +87,7 @@ in
 
     # Keep debug symbols in the debug variant of the library
     dontStrip = enableDebug;
+    separateDebugInfo = true;
 
     buildInputs = [
       autoconf
diff --git a/pkgs/nodes/default.nix b/pkgs/nodes/default.nix
index c11d5be..3dde364 100644
--- a/pkgs/nodes/default.nix
+++ b/pkgs/nodes/default.nix
@@ -51,6 +51,7 @@ in
 
     enableParallelBuilding = true;
     dontStrip = true;
+    separateDebugInfo = true;
 
     configureFlags = [
       "--with-nosv=${nosv}"
diff --git a/pkgs/nosv/default.nix b/pkgs/nosv/default.nix
index 8ed7337..4d34523 100644
--- a/pkgs/nosv/default.nix
+++ b/pkgs/nosv/default.nix
@@ -42,6 +42,7 @@ in
     inherit (source) src version;
     hardeningDisable = [ "all" ];
     dontStrip = true;
+    separateDebugInfo = true;
     configureFlags = [ "--with-ovni=${ovni}" ];
     buildInputs = [
       autoreconfHook
diff --git a/pkgs/ovni/default.nix b/pkgs/ovni/default.nix
index 9f23ee1..3bd54da 100644
--- a/pkgs/ovni/default.nix
+++ b/pkgs/ovni/default.nix
@@ -38,6 +38,8 @@ in
   stdenv.mkDerivation rec {
     pname = "ovni";
     inherit (source) src version;
+    dontStrip = true;
+    separateDebugInfo = true;
     postPatch = ''
       patchShebangs --build test/
     '';
@@ -47,7 +49,6 @@ in
     preCheck = ''
       export CTEST_OUTPUT_ON_FAILURE=1
     '';
-    dontStrip = true;
     doCheck = true;
     checkTarget = "test";
     hardeningDisable = [ "all" ];
diff --git a/pkgs/tagaspi/default.nix b/pkgs/tagaspi/default.nix
index fbeac55..71fba52 100644
--- a/pkgs/tagaspi/default.nix
+++ b/pkgs/tagaspi/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
   pname = "tagaspi";
   version = src.shortRev;
   enableParallelBuilding = true;
+  separateDebugInfo = true;
 
   buildInputs = [
     autoreconfHook
diff --git a/pkgs/tampi/default.nix b/pkgs/tampi/default.nix
index 7eb3885..392131c 100644
--- a/pkgs/tampi/default.nix
+++ b/pkgs/tampi/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
   version = "2.0";
   pname = "tampi";
   enableParallelBuilding = true;
+  separateDebugInfo = true;
   buildInputs = [ autoreconfHook automake autoconf libtool gnumake boost mpi gcc ];
   dontDisableStatic = true;