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

Merge pull request #48276 from LnL7/darwin-nix-index 

nix-index: fix darwin build
This commit is contained in:
Silvan Mosberger 2018-10-12 19:40:51 +02:00 committed by GitHub
parent 5eb7ca4e5d 5c14decaa3
commit e2d857a332
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/package-management/nix-index/default.nix
View File

@ -1,8 +1,8 @@
{ lib, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl }: { stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl
, Security
}:
with rustPlatform; rustPlatform.buildRustPackage rec {
buildRustPackage rec {
name = "nix-index-${version}"; name = "nix-index-${version}";
version = "0.1.2"; version = "0.1.2";
@ -14,7 +14,8 @@ buildRustPackage rec {
}; };
cargoSha256 = "045qm7cyg3sdvf22i8b9cz8gsvggs5bn9xz8k1pvn5gxb7zj24cx"; cargoSha256 = "045qm7cyg3sdvf22i8b9cz8gsvggs5bn9xz8k1pvn5gxb7zj24cx";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl curl]; buildInputs = [ openssl curl ]
++ stdenv.lib.optional stdenv.isDarwin Security;
postInstall = '' postInstall = ''
mkdir -p $out/etc/profile.d mkdir -p $out/etc/profile.d
@ -23,7 +24,7 @@ buildRustPackage rec {
--replace "@out@" "$out" --replace "@out@" "$out"
''; '';
meta = with lib; { meta = with stdenv.lib; {
description = "A files database for nixpkgs"; description = "A files database for nixpkgs";
homepage = https://github.com/bennofs/nix-index; homepage = https://github.com/bennofs/nix-index;
license = with licenses; [ bsd3 ]; license = with licenses; [ bsd3 ];

4
pkgs/top-level/all-packages.nix
View File

@ -21969,7 +21969,9 @@ with pkgs;
nix-info = callPackage ../tools/nix/info { }; nix-info = callPackage ../tools/nix/info { };
nix-info-tested = nix-info.override { doCheck = true; }; nix-info-tested = nix-info.override { doCheck = true; };
nix-index = callPackage ../tools/package-management/nix-index { }; nix-index = callPackage ../tools/package-management/nix-index {
inherit (darwin.apple_sdk.frameworks) Security;
};
nix-pin = callPackage ../tools/package-management/nix-pin { }; nix-pin = callPackage ../tools/package-management/nix-pin { };