[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Installing guix from Git
From: |
Ludovic Courtès |
Subject: |
Re: Installing guix from Git |
Date: |
Wed, 12 Jun 2013 09:43:10 +0200 |
User-agent: |
Gnus/5.130007 (Ma Gnus v0.7) Emacs/24.3 (gnu/linux) |
Konrad Hinsen <address@hidden> skribis:
> Ludovic Courtès writes:
>
> > Yes, probably (this is not a problem when it’s used in a build
> > environment, because everything is under /nix/store anyway.)
>
> Right. And in a user environment, it is quite useful to be able to
> link to impure libraries, so perhaps the best solution is to
> make this the default (not sure though), or at least discuss the
> environment variable in the documentation.
I just pushed this patch in the new ‘core-updates’ branch:
commit cfbf7877a673400881db20521a9d6a44261ed62b (HEAD, refs/heads/core-updates)
Author: Ludovic Courtès <address@hidden>
Date: Wed Jun 12 09:39:31 2013 +0200
ld-wrapper: Unless in a build env., allow files that symlink to the store.
* gnu/packages/ld-wrapper.scm (pure-file-name?): As a last resort, when
%BUILD-DIRECTORY is false, check whether FILE is a symlink, and loop
over it to check whether its target is in the store.
Modified gnu/packages/ld-wrapper.scm
diff --git a/gnu/packages/ld-wrapper.scm b/gnu/packages/ld-wrapper.scm
index fd5a4cb..41ff3df 100644
--- a/gnu/packages/ld-wrapper.scm
+++ b/gnu/packages/ld-wrapper.scm
@@ -11,7 +11,7 @@ main="(@ (gnu build-support ld-wrapper) ld-wrapper)"
exec @GUILE@ -c "(load-compiled \"$0.go\") (apply $main (cdr (command-line)))"
"$@"
!#
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -82,13 +82,26 @@ exec @GUILE@ -c "(load-compiled \"$0.go\") (apply $main
(cdr (command-line)))" "
(getenv "GUIX_LD_WRAPPER_DEBUG"))
(define (pure-file-name? file)
- ;; Return #t when FILE is the name of a file either within the store or
- ;; within the build directory.
- (or (not (string-prefix? "/" file))
- (string-prefix? %store-directory file)
- (string-prefix? %temporary-directory file)
- (and %build-directory
- (string-prefix? %build-directory file))))
+ ;; Return #t when FILE is the name of a file either within the store
+ ;; (possibly via a symlink) or within the build directory.
+ (define %max-symlink-depth 50)
+
+ (let loop ((file file)
+ (depth 0))
+ (or (not (string-prefix? "/" file))
+ (string-prefix? %store-directory file)
+ (string-prefix? %temporary-directory file)
+ (if %build-directory
+ (string-prefix? %build-directory file)
+
+ ;; When used from a user environment, FILE may refer to
+ ;; ~/.guix-profile/lib/libfoo.so, which is itself a symlink to the
+ ;; store. Check whether this is the case.
+ (let ((s (false-if-exception (lstat file))))
+ (and s
+ (eq? 'symlink (stat:type s))
+ (< depth %max-symlink-depth)
+ (loop (readlink file) (+ 1 depth))))))))
(define (switch-arguments switch args)
;; Return the arguments passed for the occurrences of SWITCH--e.g.,
It should leave the behavior unchanged in build environments, while
allowing libraries that are symlinks to the store in user environments.
Thanks!
Ludo’.
- Re: Installing guix from Git, (continued)
- Re: Installing guix from Git, Ludovic Courtès, 2013/06/10
- Re: Installing guix from Git, Konrad Hinsen, 2013/06/10
- Re: Installing guix from Git, Ludovic Courtès, 2013/06/10
- Re: Installing guix from Git, Konrad Hinsen, 2013/06/11
- Re: Installing guix from Git, Ludovic Courtès, 2013/06/11
- Re: Installing guix from Git, Konrad Hinsen, 2013/06/11
- Re: Installing guix from Git, Ludovic Courtès, 2013/06/11
- Re: Installing guix from Git, Konrad Hinsen, 2013/06/11
- Re: Installing guix from Git, Ludovic Courtès, 2013/06/11
- Re: Installing guix from Git, Konrad Hinsen, 2013/06/12
- Re: Installing guix from Git,
Ludovic Courtès <=
- Re: Installing guix from Git, Konrad Hinsen, 2013/06/11