From cf8b312d1872aec1f38a179eeb981d79bf7faa03 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 20 May 2016 22:11:56 +0200
Subject: grafts: Preserve empty directories when grafting.

* guix/build/graft.scm (rewrite-directory)[rewrite-leaf]: Add case for
'directory.
Pass #:directories? #t to 'find-files'.
---
 guix/build/graft.scm |  5 ++++-
 tests/grafts.scm     | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/guix/build/graft.scm b/guix/build/graft.scm
index b216e6c0d7..e9fce03181 100644
--- a/guix/build/graft.scm
+++ b/guix/build/graft.scm
@@ -115,6 +115,8 @@ (define (rewrite-leaf file)
                    (replace-store-references input output mapping
                                              store)
                    (chmod output (stat:perms stat))))))))
+        ((directory)
+         (mkdir-p dest))
         (else
          (error "unsupported file type" stat)))))
 
@@ -124,6 +126,7 @@ (define (rewrite-leaf file)
   (umask #o022)
 
   (n-par-for-each (parallel-job-count)
-                  rewrite-leaf (find-files directory)))
+                  rewrite-leaf (find-files directory (const #t)
+                                           #:directories? #t)))
 
 ;;; graft.scm ends here
diff --git a/tests/grafts.scm b/tests/grafts.scm
index afed704cde..f8c9eced1d 100644
--- a/tests/grafts.scm
+++ b/tests/grafts.scm
@@ -127,6 +127,30 @@ (define %mkdir
                        (list one two dep)
                        (references %store dep)))))))
 
+(test-assert "graft-derivation, preserve empty directories"
+  (run-with-store %store
+    (mlet* %store-monad ((fake    (text-file "bash" "Fake bash."))
+                         (graft -> (graft
+                                     (origin %bash)
+                                     (replacement fake)))
+                         (drv     (gexp->derivation
+                                   "to-graft"
+                                   #~(begin
+                                       (use-modules (guix build utils))
+                                       (mkdir-p (string-append #$output
+                                                               "/a/b/c/d"))
+                                       (symlink #$%bash
+                                                (string-append #$output
+                                                               "/bash")))
+                                   #:modules '((guix build utils))))
+                         (grafted ((store-lift graft-derivation) drv
+                                   (list graft)))
+                         (_       (built-derivations (list grafted)))
+                         (out ->  (derivation->output-path grafted)))
+      (return (and (string=? (readlink (string-append out "/bash"))
+                             fake)
+                   (file-is-directory? (string-append out "/a/b/c/d")))))))
+
 (test-assert "graft-derivation, no dependencies on grafted output"
   (run-with-store %store
     (mlet* %store-monad ((fake    (text-file "bash" "Fake bash."))
-- 
cgit v1.2.3