figsoda 2023-01-16 11:21:36 -05:00
parent 3b0ea1e099
commit 18174bdf86
2 changed files with 11 additions and 9 deletions

View file

@ -5,29 +5,33 @@
, libgit2
, openssl
, stdenv
, Security
, darwin
, git
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-generate";
version = "0.17.4";
version = "0.17.5";
src = fetchFromGitHub {
owner = "cargo-generate";
repo = "cargo-generate";
rev = "v${version}";
sha256 = "sha256-3dJ16G1PCLAV1sxtDt+eru+Chg7SWt+K/crJgXMO++k=";
sha256 = "sha256-VKhlPg4H04HdfIgXCXx560oFRwxPotGnGfczZ8PfVog=";
};
# patch Cargo.toml to not vendor libgit2 and openssl
cargoPatches = [ ./no-vendor.patch ];
cargoSha256 = "sha256-eLPLBBytzjKfJk0pbPBC0kJrxkelfDrAj5kaM6g9z9w=";
cargoSha256 = "sha256-TbmivH9LXwESpqk2RFEZYZRDlLyuAyek8JxQEROsPYs=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libgit2 openssl ]
++ lib.optionals stdenv.isDarwin [ Security ];
buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
checkInputs = [ git ];
preCheck = ''
export HOME=$(mktemp -d) USER=nixbld

View file

@ -15612,9 +15612,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) IOKit Security CoreFoundation AppKit System;
};
cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { };
cargo-generate = callPackage ../development/tools/rust/cargo-generate {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-generate = callPackage ../development/tools/rust/cargo-generate { };
cargo-bootimage = callPackage ../development/tools/rust/bootimage { };
cargo-whatfeatures = callPackage ../development/tools/rust/cargo-whatfeatures {