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

Merge pull request #52784 from marsam/diskus-enable-darwin

Browse Source 
diskus: enable build on darwin
This commit is contained in:
Vladyslav M 2018-12-24 23:26:13 +02:00 committed by GitHub
commit c9dd7b46e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/misc/diskus/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
{ stdenv, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
name = "diskus-${version}";
@ -11,6 +11,8 @@ rustPlatform.buildRustPackage rec {
sha256 = "18scxspi5ncags8bnxq4ah9w8hrlwwlgpq7q9qfh4d81asmbyr8n";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "1syrmm5qpz7d1h17xpw1wa3d2snaz9n7d1avsjp7xz8s2qcx1wdc";
meta = with stdenv.lib; {
@ -18,6 +20,6 @@ rustPlatform.buildRustPackage rec {
homepage = https://github.com/sharkdp/diskus;
license = with licenses; [ asl20 /* or */ mit ];
maintainers = [ maintainers.fuerbringer ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

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

@ -700,7 +700,9 @@ in
deskew = callPackage ../applications/graphics/deskew { };
diskus = callPackage ../tools/misc/diskus { };
diskus = callPackage ../tools/misc/diskus {
inherit (darwin.apple_sdk.frameworks) Security;
};
djmount = callPackage ../tools/filesystems/djmount { };