diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-05-24 23:23:23 -0500 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2020-05-24 23:23:23 -0500 |
| commit | 3a3cbfd12b0998a6a31e6a8cd13fa13cf5e4fe7c (patch) | |
| tree | 766845eb8924a78c156515a6f3e8a26cdc552860 /pkgs | |
| parent | 8198d23ed72ec250f1a34144ab51c21dcd9b87a8 (diff) | |
| download | nixpkgs-3a3cbfd12b0998a6a31e6a8cd13fa13cf5e4fe7c.tar nixpkgs-3a3cbfd12b0998a6a31e6a8cd13fa13cf5e4fe7c.tar.gz nixpkgs-3a3cbfd12b0998a6a31e6a8cd13fa13cf5e4fe7c.tar.bz2 nixpkgs-3a3cbfd12b0998a6a31e6a8cd13fa13cf5e4fe7c.tar.lz nixpkgs-3a3cbfd12b0998a6a31e6a8cd13fa13cf5e4fe7c.tar.xz nixpkgs-3a3cbfd12b0998a6a31e6a8cd13fa13cf5e4fe7c.tar.zst nixpkgs-3a3cbfd12b0998a6a31e6a8cd13fa13cf5e4fe7c.zip | |
monolith: enable on darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/backup/monolith/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index b87f900ad98..261267b809a 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pkg-config , openssl +, Security }: rustPlatform.buildRustPackage rec { @@ -18,10 +19,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1plx9p265jcc6wg3bhcdk1f77md8ann08kkv3g2706d82kxy2c1i"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - checkPhase = "cargo test -- --skip tests::cli"; + checkFlagsArray = [ "--skip=tests::cli" ]; meta = with stdenv.lib; { description = "Bundle any web page into a single HTML file"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bd1772db83..b40c68c67c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5264,7 +5264,9 @@ in monit = callPackage ../tools/system/monit { }; - monolith = callPackage ../tools/backup/monolith { }; + monolith = callPackage ../tools/backup/monolith { + inherit (darwin.apple_sdk.frameworks) Security; + }; moreutils = callPackage ../tools/misc/moreutils { docbook-xsl = docbook_xsl; |