From 8c7e043de2f673bc355d83f1e873baa93f30be62 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 12 May 2021 21:40:28 -0500
Subject: Fix tokenize output names in drv

This should fix the issue described in
https://discourse.nixos.org/t/derivation-does-not-have-wanted-outputs-dev-out/12905.

Specifically, we get an error of

  error: derivation '/nix/store/_.drv' does not have wanted outputs 'dev,out'

when a path like /nix/store/_.drv!dev,out is sent to the daemon.
---
 src/libstore/derived-path.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/libstore/derived-path.cc b/src/libstore/derived-path.cc
index 13833c58e..9cfbf50d9 100644
--- a/src/libstore/derived-path.cc
+++ b/src/libstore/derived-path.cc
@@ -62,7 +62,7 @@ DerivedPath::Built DerivedPath::Built::parse(const Store & store, std::string_vi
     auto outputsS = s.substr(n + 1);
     std::set<string> outputs;
     if (outputsS != "*")
-        outputs = tokenizeString<std::set<string>>(outputsS);
+        outputs = tokenizeString<std::set<string>>(outputsS, ",");
     return {drvPath, outputs};
 }
 
-- 
cgit v1.2.3