aboutsummaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-02-11 22:52:28 +0100
committerLudovic Courtès <ludo@gnu.org>2019-02-11 23:23:28 +0100
commit910d0121a8b6515febf0a02e4d23c249f98c0da2 (patch)
treecd15da4172eb61dd0bccada8d04443d4f5574d71 /gnu/system
parent1d8b10d00f0c242bc5ce9540737af3d3f24a05c0 (diff)
downloadguix-910d0121a8b6515febf0a02e4d23c249f98c0da2.tar
guix-910d0121a8b6515febf0a02e4d23c249f98c0da2.tar.gz
pack, vm: Fix incorrect use of 'package-transitive-propagated-inputs'.
In practice the error was not triggered because 'package-transitive-propagated-inputs' currently returns the empty list for these two packages. * guix/scripts/pack.scm (gcrypt-sqlite3&co): Remove labels from the result. * gnu/system/vm.scm (gcrypt-sqlite3&co): Likewise.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/vm.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 088b582bcd..e09c687a04 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -134,7 +134,9 @@
;; Guile-Gcrypt, Guile-SQLite3, and their propagated inputs.
(append-map (lambda (package)
(cons package
- (package-transitive-propagated-inputs package)))
+ (match (package-transitive-propagated-inputs package)
+ (((labels packages) ...)
+ packages))))
(list guile-gcrypt guile-sqlite3)))
(define* (expression->derivation-in-linux-vm name exp