Make zsh-histdb use sqlite3 directly instead of depending on systemPackages.
This commit is contained in:
		
							parent
							
								
									f524aa168a
								
							
						
					
					
						commit
						c694c6ae4c
					
				
							
								
								
									
										2
									
								
								nix/configuration/flake.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								nix/configuration/flake.lock
									
									
									
										generated
									
									
									
								
							| @ -327,7 +327,7 @@ | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1, | ||||
|         "narHash": "sha256-TFks1dvPwAXKQeePh9jmxj06ZfXArH1pN9yXVQWeL6w=", | ||||
|         "narHash": "sha256-5DWw7GnwVZ98HUp/UUJcyUmmy9Bh/mcQB8MQQ0t3ZRo=", | ||||
|         "path": "flakes/zsh-histdb", | ||||
|         "type": "path" | ||||
|       }, | ||||
|  | ||||
| @ -21,9 +21,16 @@ stdenv.mkDerivation { | ||||
|     sha256 = "sha256-vtG1poaRVbfb/wKPChk1WpPgDq+7udLqLfYfLqap4Vg="; | ||||
|   }; | ||||
|   buildInputs = [ sqlite ]; | ||||
|   phases = [ "installPhase" ]; | ||||
|   phases = [ | ||||
|     "installPhase" | ||||
|   ]; | ||||
|   installPhase = '' | ||||
|     runHook preInstall | ||||
|     mkdir -p $out/share/zsh/plugins/zsh-histdb | ||||
|     cp -r $src/histdb-* $src/*.zsh $src/db_migrations $out/share/zsh/plugins/zsh-histdb/ | ||||
|     runHook postInstall | ||||
|   ''; | ||||
|   postInstall = '' | ||||
|     substituteInPlace $out/share/zsh/plugins/zsh-histdb/sqlite-history.zsh $out/share/zsh/plugins/zsh-histdb/histdb-merge $out/share/zsh/plugins/zsh-histdb/histdb-migrate --replace-fail "sqlite3" "${sqlite}/bin/sqlite3" | ||||
|   ''; | ||||
| } | ||||
|  | ||||
| @ -64,7 +64,6 @@ in | ||||
| 
 | ||||
|   environment.systemPackages = with pkgs; [ | ||||
|     zsh | ||||
|     sqlite # TODO: can this be pulled into zsh-histdb automatically? | ||||
|   ]; | ||||
| 
 | ||||
|   users.users.talexander.shell = pkgs.zsh; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Tom Alexander
						Tom Alexander