summary refs log tree commit diff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2017-06-27 09:51:33 +0200
committerRicardo Wurmus <rekado@elephly.net>2017-06-29 16:06:14 +0200
commitc860d6ef235b47ec8181fbf390e0b42fbc95dcfe (patch)
tree31919c71e23d3824b07b910101d6b4c587990c79
parentd34970ee2ba0f65c491d306073c9b3a598516f1d (diff)
downloadguix-c860d6ef235b47ec8181fbf390e0b42fbc95dcfe.tar.gz
gnu: xfce: Build union instead of propagating inputs.
* gnu/packages/xfce.scm (xfce)[propagated-inputs]: Move all...
[inputs]: ...here.
[arguments]: Build a union.
-rw-r--r--gnu/packages/xfce.scm13
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index d7d1372dd2..d54b7f6401 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -698,8 +698,17 @@ on your desktop.")
     (version (package-version xfce4-session))
     (source #f)
     (build-system trivial-build-system)
-    (arguments '(#:builder (mkdir %output)))
-    (propagated-inputs
+    (arguments
+     '(#:modules ((guix build union))
+       #:builder
+       (begin
+         (use-modules (ice-9 match)
+                      (guix build union))
+         (match %build-inputs
+           (((names . directories) ...)
+            (union-build (assoc-ref %outputs "out")
+                         directories))))))
+    (inputs
      `(("exo"                  ,exo)
        ("garcon"               ,garcon)
        ("gnome-icon-theme"     ,gnome-icon-theme)