* Hack to get around the libtool wrapper script around nix-store not
working when PATH is unset.
This commit is contained in:
		
							parent
							
								
									3fae65d4cc
								
							
						
					
					
						commit
						33efb52e02
					
				
					 2 changed files with 5 additions and 1 deletions
				
			
		|  | @ -40,7 +40,6 @@ gc-concurrent.sh: gc-concurrent.nix gc-concurrent2.nix | ||||||
| TESTS = init.sh hash.sh lang.sh simple.sh dependencies.sh locking.sh parallel.sh \ | TESTS = init.sh hash.sh lang.sh simple.sh dependencies.sh locking.sh parallel.sh \ | ||||||
|   build-hook.sh substitutes.sh substitutes2.sh fallback.sh nix-push.sh gc.sh \ |   build-hook.sh substitutes.sh substitutes2.sh fallback.sh nix-push.sh gc.sh \ | ||||||
|   gc-concurrent.sh verify.sh nix-pull.sh |   gc-concurrent.sh verify.sh nix-pull.sh | ||||||
| #TESTS = init.sh gc.sh |  | ||||||
| 
 | 
 | ||||||
| XFAIL_TESTS = | XFAIL_TESTS = | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -56,6 +56,11 @@ for i in \ | ||||||
|     chmod +x $i |     chmod +x $i | ||||||
| done | done | ||||||
| 
 | 
 | ||||||
|  | # Another ugly hack. | ||||||
|  | sed "s|^$|PATH=$PATH|" < $NIX_DATA_DIR/nix/corepkgs/nar/nar.sh > tmp | ||||||
|  | chmod +x tmp | ||||||
|  | mv tmp $NIX_DATA_DIR/nix/corepkgs/nar/nar.sh | ||||||
|  | 
 | ||||||
| # Initialise the database. | # Initialise the database. | ||||||
| $TOP/src/nix-store/nix-store --init | $TOP/src/nix-store/nix-store --init | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue