chore(tvix): patch crate2nix to drop darwin dontStrip
This patch has already been applied on upstream but there hasn't been an
official release yet so we patch it ourselves.
Upstreamed patch: 0209f258cd
Follow-up of: https://cl.tvl.fyi/c/depot/+/11856
Change-Id: If56071ce5753fd26e2b4c203cd831bbe5d329009
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11858
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
			
			
This commit is contained in:
		
							parent
							
								
									92c5433304
								
							
						
					
					
						commit
						9fd601e53d
					
				
					 3 changed files with 24 additions and 2 deletions
				
			
		
							
								
								
									
										22
									
								
								third_party/overlays/patches/crate2nix-drop-darwin-explicit-dontstrip.patch
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								third_party/overlays/patches/crate2nix-drop-darwin-explicit-dontstrip.patch
									
										
									
									
										vendored
									
									
										Normal file
									
								
							|  | @ -0,0 +1,22 @@ | ||||||
|  | From 0209f258cda8a9972a785e26d92fb477ce4d1b0e Mon Sep 17 00:00:00 2001 | ||||||
|  | From: Ilan Joselevich <personal@ilanjoselevich.com> | ||||||
|  | Date: Tue, 11 Jun 2024 18:14:06 +0300 | ||||||
|  | Subject: [PATCH] Get rid of dontStrip for Darwin as it's no longer needed | ||||||
|  | 
 | ||||||
|  | Fixed in https://github.com/NixOS/nixpkgs/pull/255900 | ||||||
|  | ---
 | ||||||
|  |  templates/nix/crate2nix/default.nix                  | 2 -- | ||||||
|  | 
 | ||||||
|  | diff --git a/templates/nix/crate2nix/default.nix b/templates/nix/crate2nix/default.nix
 | ||||||
|  | index 95d3730f..c53925e7 100644
 | ||||||
|  | --- a/templates/nix/crate2nix/default.nix
 | ||||||
|  | +++ b/templates/nix/crate2nix/default.nix
 | ||||||
|  | @@ -349,8 +349,6 @@ rec {
 | ||||||
|  |            buildRustCrateForPkgsFunc pkgs | ||||||
|  |              ( | ||||||
|  |                crateConfig // { | ||||||
|  | -                # https://github.com/NixOS/nixpkgs/issues/218712
 | ||||||
|  | -                dontStrip = stdenv.hostPlatform.isDarwin;
 | ||||||
|  |                  src = crateConfig.src or ( | ||||||
|  |                    pkgs.fetchurl rec { | ||||||
|  |                      name = "${crateConfig.crateName}-${crateConfig.version}.tar.gz"; | ||||||
							
								
								
									
										2
									
								
								third_party/overlays/tvl.nix
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								third_party/overlays/tvl.nix
									
										
									
									
										vendored
									
									
								
							|  | @ -101,6 +101,8 @@ depot.nix.readTree.drvTargets { | ||||||
|     patches = old.patches or [ ] ++ [ |     patches = old.patches or [ ] ++ [ | ||||||
|       # https://github.com/nix-community/crate2nix/pull/301 |       # https://github.com/nix-community/crate2nix/pull/301 | ||||||
|       ./patches/crate2nix-tests-debug.patch |       ./patches/crate2nix-tests-debug.patch | ||||||
|  |       # TODO(Kranzes): drop on next release | ||||||
|  |       ./patches/crate2nix-drop-darwin-explicit-dontstrip.patch | ||||||
|     ]; |     ]; | ||||||
|   }); |   }); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -18000,8 +18000,6 @@ rec { | ||||||
|             buildRustCrateForPkgsFunc pkgs |             buildRustCrateForPkgsFunc pkgs | ||||||
|               ( |               ( | ||||||
|                 crateConfig // { |                 crateConfig // { | ||||||
|                   # https://github.com/NixOS/nixpkgs/issues/218712 |  | ||||||
|                   dontStrip = stdenv.hostPlatform.isDarwin; |  | ||||||
|                   src = crateConfig.src or ( |                   src = crateConfig.src or ( | ||||||
|                     pkgs.fetchurl rec { |                     pkgs.fetchurl rec { | ||||||
|                       name = "${crateConfig.crateName}-${crateConfig.version}.tar.gz"; |                       name = "${crateConfig.crateName}-${crateConfig.version}.tar.gz"; | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue