JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

atuin: use buildPackages.protobuf

Browse Source
This commit is contained in:
0x4A6F 2024-06-17 19:43:53 +02:00
parent 6263d23ea4
commit 36c6b2e9a2
No known key found for this signature in database
GPG Key ID: 8DEDBA5BE07080E1
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/by-name/at/atuin/package.nix
View File

@ -4,7 +4,7 @@
, installShellFiles
, rustPlatform
, libiconv
, protobuf
, buildPackages
, darwin
, nixosTests
}:
@ -35,9 +35,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ installShellFiles ];
buildInputs = [
protobuf
] ++ lib.optionals stdenv.isDarwin [
buildInputs = lib.optionals stdenv.isDarwin [
libiconv
darwin.apple_sdk_11_0.frameworks.AppKit
darwin.apple_sdk_11_0.frameworks.Security
@ -45,8 +43,8 @@ rustPlatform.buildRustPackage rec {
];
preBuild = ''
export PROTOC=${protobuf}/bin/protoc
export PROTOC_INCLUDE="${protobuf}/include";
export PROTOC=${buildPackages.protobuf}/bin/protoc
export PROTOC_INCLUDE="${buildPackages.protobuf}/include";
'';
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''