diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-10-12 19:40:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 19:40:51 +0200 |
| commit | e2d857a33240fc21635b376e5bddda3bd58b2396 (patch) | |
| tree | 3f2fa400d96ae95705baa485158f6d3c433802b3 | |
| parent | 5eb7ca4e5d7d4c2931fa14c5575b9fe2befd2647 (diff) | |
| parent | 5c14decaa36ae559541cfb34d1477b8b1e76c81a (diff) | |
| download | nixpkgs-e2d857a33240fc21635b376e5bddda3bd58b2396.tar nixpkgs-e2d857a33240fc21635b376e5bddda3bd58b2396.tar.gz nixpkgs-e2d857a33240fc21635b376e5bddda3bd58b2396.tar.bz2 nixpkgs-e2d857a33240fc21635b376e5bddda3bd58b2396.tar.lz nixpkgs-e2d857a33240fc21635b376e5bddda3bd58b2396.tar.xz nixpkgs-e2d857a33240fc21635b376e5bddda3bd58b2396.tar.zst nixpkgs-e2d857a33240fc21635b376e5bddda3bd58b2396.zip | |
Merge pull request #48276 from LnL7/darwin-nix-index
nix-index: fix darwin build
| -rw-r--r-- | pkgs/tools/package-management/nix-index/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 0b336d47fe4..d0a81140fc8 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -1,8 +1,8 @@ -{ lib, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl }: +{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl +, Security +}: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { name = "nix-index-${version}"; version = "0.1.2"; @@ -14,7 +14,8 @@ buildRustPackage rec { }; cargoSha256 = "045qm7cyg3sdvf22i8b9cz8gsvggs5bn9xz8k1pvn5gxb7zj24cx"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl curl]; + buildInputs = [ openssl curl ] + ++ stdenv.lib.optional stdenv.isDarwin Security; postInstall = '' mkdir -p $out/etc/profile.d @@ -23,7 +24,7 @@ buildRustPackage rec { --replace "@out@" "$out" ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A files database for nixpkgs"; homepage = https://github.com/bennofs/nix-index; license = with licenses; [ bsd3 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cd28d95b16..0cc5fb80c25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21969,7 +21969,9 @@ with pkgs; nix-info = callPackage ../tools/nix/info { }; 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 { }; |