Unverified Commit 9c5859d6 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #320823 from 0x4A6F/master-atuin 

atuin: use buildPackages.protobuf
parents 5625aa14 36c6b2e9

pkgs/by-name/at/atuin/package.nix

+4 −6
Original line number Diff line number Diff line
@@ -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) ''