From 6d36062fcd49fff7ca6f7dc9b4a40d2fcb48725e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Wed, 2 Nov 2022 11:52:15 +0100
Subject: pkgs/dev: use DRV instead of Nix sources

This should make evaluation faster.
---
 pkgs/dev/default.nix | 13 ++++---------
 pkgs/dev/dev.sh      |  4 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/dev/default.nix b/pkgs/dev/default.nix
index 9238f4d..d9b7d52 100644
--- a/pkgs/dev/default.nix
+++ b/pkgs/dev/default.nix
@@ -7,7 +7,9 @@ with lib;
 
 let
 
-  shells = concatStringsSep ":" (mapAttrsToList (n: v: "${n}=${v}") devShells);
+  shells = concatStringsSep ":" (mapAttrsToList (
+      n: v: "${n}=${v.drvPath}=${v}"
+    ) devShells);
 
 in stdenvNoCC.mkDerivation rec {
   name = "personal-devshells";
@@ -17,13 +19,6 @@ in stdenvNoCC.mkDerivation rec {
   installPhase = ''
     makeShellWrapper ${./dev.sh} $out/bin/dev \
       --prefix PATH : ${lib.makeBinPath [ bash nix ]} \
-      --set DEV_SHELLS "${shells}" \
-      --set DEV_FLAKE "${../..}"
+      --set DEV_SHELLS "${shells}"
   '';
-
-  meta = with lib; {
-    description = "Console version of Stardict program";
-    homepage = "https://dushistov.github.io/sdcv/";
-    license = licenses.gpl2;
-  };
 }
diff --git a/pkgs/dev/dev.sh b/pkgs/dev/dev.sh
index f88224a..23b1fae 100755
--- a/pkgs/dev/dev.sh
+++ b/pkgs/dev/dev.sh
@@ -5,9 +5,9 @@ target="$1"
 shift
 
 known_shells="$(tr ':' '\n' <<<"${DEV_SHELLS:-}")"
-while IFS='=' read name val; do
+while IFS='=' read name drv res; do
 	if [ "$target" == "$name" ]; then
-		target="$DEV_FLAKE#$name"
+		target="$drv#$name"
 		break
 	fi
 done <<<"$known_shells"
-- 
cgit v1.2.3