mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 19:38:23 +00:00 
			
		
		
		
	fix nix dev shell on darwin (#35278)
This commit is contained in:
		
							
								
								
									
										6
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										6
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							| @@ -20,11 +20,11 @@ | |||||||
|     }, |     }, | ||||||
|     "nixpkgs": { |     "nixpkgs": { | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1752480373, |         "lastModified": 1755027561, | ||||||
|         "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", |         "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", | ||||||
|         "owner": "nixos", |         "owner": "nixos", | ||||||
|         "repo": "nixpkgs", |         "repo": "nixpkgs", | ||||||
|         "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", |         "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|   | |||||||
							
								
								
									
										24
									
								
								flake.nix
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								flake.nix
									
									
									
									
									
								
							| @@ -18,8 +18,19 @@ | |||||||
|             go = go_1_24; |             go = go_1_24; | ||||||
|             nodejs = nodejs_24; |             nodejs = nodejs_24; | ||||||
|             python3 = python312; |             python3 = python312; | ||||||
|  |  | ||||||
|  |             # Platform-specific dependencies | ||||||
|  |             linuxOnlyInputs = lib.optionals pkgs.stdenv.isLinux [ | ||||||
|  |               glibc.static | ||||||
|  |             ]; | ||||||
|  |  | ||||||
|  |             linuxOnlyEnv = lib.optionalAttrs pkgs.stdenv.isLinux { | ||||||
|  |               CFLAGS = "-I${glibc.static.dev}/include"; | ||||||
|  |               LDFLAGS = "-L ${glibc.static}/lib"; | ||||||
|  |             }; | ||||||
|           in |           in | ||||||
|           pkgs.mkShell { |           pkgs.mkShell ( | ||||||
|  |             { | ||||||
|               buildInputs = [ |               buildInputs = [ | ||||||
|                 # generic |                 # generic | ||||||
|                 git |                 git | ||||||
| @@ -38,18 +49,19 @@ | |||||||
|  |  | ||||||
|                 # backend |                 # backend | ||||||
|                 go |                 go | ||||||
|               glibc.static |  | ||||||
|                 gofumpt |                 gofumpt | ||||||
|                 sqlite |                 sqlite | ||||||
|             ]; |               ] | ||||||
|             CFLAGS = "-I${glibc.static.dev}/include"; |               ++ linuxOnlyInputs; | ||||||
|             LDFLAGS = "-L ${glibc.static}/lib"; |  | ||||||
|               GO = "${go}/bin/go"; |               GO = "${go}/bin/go"; | ||||||
|               GOROOT = "${go}/share/go"; |               GOROOT = "${go}/share/go"; | ||||||
|  |  | ||||||
|               TAGS = "sqlite sqlite_unlock_notify"; |               TAGS = "sqlite sqlite_unlock_notify"; | ||||||
|               STATIC = "true"; |               STATIC = "true"; | ||||||
|           }; |             } | ||||||
|  |             // linuxOnlyEnv | ||||||
|  |           ); | ||||||
|       } |       } | ||||||
|     ); |     ); | ||||||
| } | } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user