gnu: guix: Ignore the user's 'GUILE_LOAD_COMPILED_PATH'.
Reported by <rain1@openmailbox.org>. * gnu/packages/package-management.scm (guix-0.10.0)[arguments]: Use '= instead of 'prefix in call to 'wrap-program'.
This commit is contained in:
		
							parent
							
								
									3a9a4c51e8
								
							
						
					
					
						commit
						61cdad351d
					
				
					 1 changed files with 9 additions and 2 deletions
				
			
		| 
						 | 
					@ -140,9 +140,16 @@
 | 
				
			||||||
                            (path   (string-append
 | 
					                            (path   (string-append
 | 
				
			||||||
                                     json "/share/guile/site/2.0:"
 | 
					                                     json "/share/guile/site/2.0:"
 | 
				
			||||||
                                     gnutls "/share/guile/site/2.0")))
 | 
					                                     gnutls "/share/guile/site/2.0")))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                       ;; Ignore user settings so that a bogus
 | 
				
			||||||
 | 
					                       ;; GUILE_LOAD_COMPILED_PATH does not prevent use of
 | 
				
			||||||
 | 
					                       ;; 'guix', notably when it contains entries pointing to
 | 
				
			||||||
 | 
					                       ;; incompatible .go files as reported at
 | 
				
			||||||
 | 
					                       ;; <https://lists.gnu.org/archive/html/guix-devel/2016-03/msg01261.html>.
 | 
				
			||||||
                       (wrap-program (string-append out "/bin/guix")
 | 
					                       (wrap-program (string-append out "/bin/guix")
 | 
				
			||||||
                         `("GUILE_LOAD_PATH" ":" prefix (,path))
 | 
					                         `("GUILE_LOAD_PATH" ":" = (,path))
 | 
				
			||||||
                         `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,path)))
 | 
					                         `("GUILE_LOAD_COMPILED_PATH" ":" = (,path)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                       #t))))))
 | 
					                       #t))))))
 | 
				
			||||||
    (native-inputs `(("pkg-config" ,pkg-config)
 | 
					    (native-inputs `(("pkg-config" ,pkg-config)
 | 
				
			||||||
                     ("emacs" ,emacs-no-x)))      ;for guix.el
 | 
					                     ("emacs" ,emacs-no-x)))      ;for guix.el
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue