diff mbox

[1/2] gnu: tzdata: Fix dangling symbolic link.

Message ID 1475777887-6628-1-git-send-email-jmd@gnu.org
State New
Headers show

Commit Message

John Darrington Oct. 6, 2016, 6:18 p.m. UTC
* gnu/packages/base.scm (tzdata)[arguments]: Replace dangling symbolic link
with the correct path.
---
 gnu/packages/base.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Ludovic Courtès Oct. 6, 2016, 7:36 p.m. UTC | #1
John Darrington <jmd@gnu.org> skribis:

> * gnu/packages/base.scm (tzdata)[arguments]: Replace dangling symbolic link
> with the correct path.
> ---
>  gnu/packages/base.scm | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
> index a476837..52d8de3 100644
> --- a/gnu/packages/base.scm
> +++ b/gnu/packages/base.scm
> @@ -946,11 +946,11 @@ command.")
>           (lambda* (#:key outputs #:allow-other-keys)
>             ;; Move data in the right place.
>             (let ((out (assoc-ref outputs "out")))
> -             (copy-recursively (string-append out "/share/zoneinfo-posix")
> -                               (string-append out "/share/zoneinfo/posix"))
> +             (symlink (string-append out "/share/zoneinfo")
> +                      (string-append out "/share/zoneinfo/posix"))

Or even:

  (symlink "." (string-append out "/share/zoneinfo/posix"))

OK for core-updates, thanks!

Ludo’.
Danny Milosavljevic Oct. 6, 2016, 8:40 p.m. UTC | #2
>   (symlink "." (string-append out "/share/zoneinfo/posix"))

"..", no?
Ludovic Courtès Oct. 7, 2016, 7:53 p.m. UTC | #3
Danny Milosavljevic <dannym@scratchpost.org> skribis:

>>   (symlink "." (string-append out "/share/zoneinfo/posix"))
>
> "..", no?

No, I don’t think so.

Ludo’.
Danny Milosavljevic Oct. 7, 2016, 7:58 p.m. UTC | #4
On Fri, 07 Oct 2016 21:53:29 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> Danny Milosavljevic <dannym@scratchpost.org> skribis:
> 
> >>   (symlink "." (string-append out "/share/zoneinfo/posix"))  
> >
> > "..", no?  
> 
> No, I don’t think so.

Ah I see. Endless loop :)

Nevermind, it's correct with ".".
diff mbox

Patch

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index a476837..52d8de3 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -946,11 +946,11 @@  command.")
          (lambda* (#:key outputs #:allow-other-keys)
            ;; Move data in the right place.
            (let ((out (assoc-ref outputs "out")))
-             (copy-recursively (string-append out "/share/zoneinfo-posix")
-                               (string-append out "/share/zoneinfo/posix"))
+             (symlink (string-append out "/share/zoneinfo")
+                      (string-append out "/share/zoneinfo/posix"))
+             (delete-file-recursively (string-append out "/share/zoneinfo-posix"))
              (copy-recursively (string-append out "/share/zoneinfo-leaps")
                                (string-append out "/share/zoneinfo/right"))
-             (delete-file-recursively (string-append out "/share/zoneinfo-posix"))
              (delete-file-recursively (string-append out "/share/zoneinfo-leaps"))))
          (alist-delete 'configure %standard-phases)))))
     (inputs `(("tzcode" ,(origin