(zilch nixpkgs): fix non-out derivations
Change-Id: I542e0cb1f6a33261b9c4f1b620636c8c6a6a6964
This commit is contained in:
parent
5bf80a463e
commit
553df0b2fe
1 changed files with 5 additions and 1 deletions
|
|
@ -4,7 +4,7 @@
|
|||
(scheme base) (scheme lazy) (scheme read)
|
||||
(zilch magic) (zilch nix drv) (zilch nix hash)
|
||||
(zilch nix path) (zilch zexpr)
|
||||
(srfi 18) (srfi 128) (srfi 146)
|
||||
(srfi 18) (srfi 128) (srfi 146) (srfi 152)
|
||||
(chicken format) (chicken process)
|
||||
json)
|
||||
(export nix-prefetch-url nixpkgs nixpkgs-eval
|
||||
|
|
@ -33,6 +33,10 @@
|
|||
(define thread (thread-start! (make-thread (lambda () (run-stderr-thread (string-append path) stderr)) "read-from-nixpkgs-raw stderr passthrough")))
|
||||
(close-port stdin)
|
||||
(define drvpath (read-line stdout))
|
||||
; If we get a /nix/store/[...].drv![output name]: remove the suffix.
|
||||
(let ((loc (string-contains drvpath "!")))
|
||||
(when loc
|
||||
(set! drvpath (string-copy drvpath 0 loc))))
|
||||
(define-values (_ _ _) (process-wait pid #t))
|
||||
(close-port stdout)
|
||||
drvpath)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue