From 4869175275695b2d6000764f14774c1fd0a526ba Mon Sep 17 00:00:00 2001
From: Dustin Frisch <fooker@lab.sh>
Date: Wed, 14 Feb 2024 13:46:50 +0100
Subject: [PATCH] fixup! packages: add cube and related packages

---
 packages/scalasca/default.nix | 2 ++
 shared/userenv.nix            | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/scalasca/default.nix b/packages/scalasca/default.nix
index 10b7005..51a63ef 100644
--- a/packages/scalasca/default.nix
+++ b/packages/scalasca/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
     "--with-mpi=openmpi"
   ];
 
+  dontStrip = true;
+
   nativeBuildinputs = [
     which
   ];
diff --git a/shared/userenv.nix b/shared/userenv.nix
index 11bd3a0..d0bf789 100644
--- a/shared/userenv.nix
+++ b/shared/userenv.nix
@@ -34,6 +34,7 @@ let
       openssh
       pandoc
       (getDev papi)
+      (getLib papi)
       perl
       pkg-config
       postgresql
@@ -47,10 +48,10 @@ let
       valgrind
       vim
       wget
-      (getDev zlib)
+      libz
 
-      (getBin scorep)
-      (getBin scalasca)
+      scorep
+      scalasca
     ];
 
     ignoreCollisions = false;