nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-16 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

magic-wormhole-rs: various cleanups (#363002)

Browse Source
This commit is contained in:
piegames 2024-12-09 10:23:03 +01:00 committed by GitHub
commit de75b91758
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/tools/networking/magic-wormhole-rs/default.nix → pkgs/by-name/ma/magic-wormhole-rs/package.nix
View File

@ -1,11 +1,10 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, libxcb
, installShellFiles
, Security
, AppKit
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
libxcb,
installShellFiles,
}:
rustPlatform.buildRustPackage rec {
pname = "magic-wormhole-rs";
@ -20,14 +19,10 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-+OcjILDwGg0eybzBgVIZeVelnQatPU6rgd/b6buvTRQ=";
buildInputs = [ libxcb ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ Security AppKit ];
buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libxcb ];
nativeBuildInputs = [ installShellFiles ];
# all tests involve networking and are bound fail
doCheck = false;
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd wormhole-rs \
--bash <($out/bin/wormhole-rs completion bash) \
@ -40,7 +35,10 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/magic-wormhole/magic-wormhole.rs";
changelog = "https://github.com/magic-wormhole/magic-wormhole.rs/raw/${version}/changelog.md";
license = licenses.eupl12;
maintainers = with maintainers; [ zeri piegames ];
maintainers = with maintainers; [
zeri
piegames
];
mainProgram = "wormhole-rs";
};
}

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

@ -14658,10 +14658,6 @@ with pkgs;
magic-wormhole = with python3Packages; toPythonApplication magic-wormhole;
magic-wormhole-rs = callPackage ../tools/networking/magic-wormhole-rs {
inherit (darwin.apple_sdk.frameworks) Security AppKit;
};
magnetophonDSP = lib.recurseIntoAttrs {
CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { };
CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { };