From bbc6199e3ddb2e6e2635e49b838e6f5793d5f213 Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Mon, 21 Sep 2020 13:15:14 +0700
Subject: [PATCH] fix: extra_pkgs don't end up in python env

---
 default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.nix b/default.nix
index 2bc7198..fc2408a 100644
--- a/default.nix
+++ b/default.nix
@@ -253,7 +253,7 @@ rec {
           }
         else p
       ) extra_pkgs;
-      extra_pkgs_attrs = foldl' (a: b: a // b) {} (map (p: { p.pname = p; }) _extra_pkgs);
+      extra_pkgs_attrs = foldl' (a: b: a // b) {} (map (p: { "${p.pname}" = p; }) _extra_pkgs);
       extra_pkgs_as_overrides = [ (pySelf: pySuper: extra_pkgs_attrs) ];
       extra_pkgs_reqs =
         map (p:
@@ -285,7 +285,7 @@ rec {
     in
       py_final.withPackages (ps:
         (result.select_pkgs ps)
-        ++ (attrValues (filterAttrs (pname: p: hasAttr pname extra_pkgs_attrs) ps))
+        ++ (map (name: ps."${name}") (attrNames extra_pkgs_attrs))
       )
     ;
 }