From f19736f4f40672acaf96e83430cb54e8a5caf719 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 27 Oct 2024 21:43:19 +0100
Subject: [PATCH] use buildEnv instead of joinsymlinks

buildEnv respects propagatedUserEnvPkgs
---
 lib.nix                   | 6 ------
 overlay.nix               | 1 -
 template/qc/nix/flake.nix | 2 +-
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib.nix b/lib.nix
index 7be72cfd..6414c692 100644
--- a/lib.nix
+++ b/lib.nix
@@ -23,10 +23,4 @@
   pkgs-by-name = callPackage: dir:
     lib.mapAttrs (pkg: _: callPackage (dir + "/${pkg}/package.nix") {})
     (lib.filterAttrs (_: type: type == "directory") (builtins.readDir dir));
-
-  buildEnvMpi = symlinkJoin: input:
-    symlinkJoin {
-      inherit (input) name;
-      paths = lib.flatten (map(x: if x ? passthru.mpi then [ x x.passthru.mpi ] else x) input.paths);
-    };
 }
diff --git a/overlay.nix b/overlay.nix
index e9deb9e3..9dad6165 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -39,7 +39,6 @@ let
 
         inherit callPackage;
         inherit aggressiveStdenv;
-        inherit qlib;
 
         #
         # Upstream overrides
diff --git a/template/qc/nix/flake.nix b/template/qc/nix/flake.nix
index 047c0bd2..938baf26 100644
--- a/template/qc/nix/flake.nix
+++ b/template/qc/nix/flake.nix
@@ -72,7 +72,7 @@
       # EDITME
       # Add packages to the default package as you wish
       packages."${system}" = (filterDrvs pkgs.qchem) // {
-        default = pkgs.qchem.qlib.buildEnvMpi pkgs.symlinkJoin {
+        default = pkgs.buildEnv {
           name = "quantum-chemistry";
           paths = [
             # put a list of packages here. e.g.: