mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-12 07:34:36 +00:00
gitAndTools.git-ignore: improve robustness
This commit is contained in:
parent
59ef82a28a
commit
3d1824896f
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }:
|
{ stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkgconfig, openssl, darwin }:
|
||||||
|
|
||||||
with rustPlatform;
|
with rustPlatform;
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ buildRustPackage rec {
|
||||||
|
|
||||||
cargoSha256 = "0vcg2pl0s329fr8p23pwdx2jy7qahbr7n337ib61f69aaxi1xmq0";
|
cargoSha256 = "0vcg2pl0s329fr8p23pwdx2jy7qahbr7n337ib61f69aaxi1xmq0";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig installShellFiles ];
|
||||||
buildInputs = [ openssl ]
|
buildInputs = [ openssl ]
|
||||||
++ stdenv.lib.optionals stdenv.isDarwin [
|
++ stdenv.lib.optionals stdenv.isDarwin [
|
||||||
darwin.apple_sdk.frameworks.Security
|
darwin.apple_sdk.frameworks.Security
|
||||||
|
@ -23,8 +23,7 @@ buildRustPackage rec {
|
||||||
|
|
||||||
outputs = [ "out" "man" ];
|
outputs = [ "out" "man" ];
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
mkdir -p "$man/man/man1"
|
installManPage $releaseDir/build/git-ignore-*/out/git-ignore.1
|
||||||
cp target/release/build/git-ignore-*/out/git-ignore.1 "$man/man/man1/"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|
Loading…
Reference in a new issue