b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #211486 from figsoda/macchina

Browse source 
macchina: fix darwin build, add figsoda as a maintainer
This commit is contained in:
figsoda 2023-01-19 18:42:45 -05:00 committed by GitHub
parent c0c1ab0efd 153f1f1e45
commit 25940fd0df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/tools/misc/macchina/default.nix
View file

@ -1,10 +1,9 @@
{ lib { lib
, stdenv
, rustPlatform , rustPlatform
, fetchFromGitHub , fetchFromGitHub
, installShellFiles , installShellFiles
, libiconv , stdenv
, Foundation , darwin
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -25,12 +24,12 @@ rustPlatform.buildRustPackage rec {
]; ];
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.isDarwin [
libiconv darwin.apple_sdk.frameworks.AppKit
Foundation darwin.apple_sdk.frameworks.DisplayServices
]; ];
postInstall = '' postInstall = ''
installShellCompletion target/completions/*.{bash,fish} installManPage doc/macchina.{1,7}
''; '';
meta = with lib; { meta = with lib; {
@ -38,6 +37,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/Macchina-CLI/macchina"; homepage = "https://github.com/Macchina-CLI/macchina";
changelog = "https://github.com/Macchina-CLI/macchina/releases/tag/v${version}"; changelog = "https://github.com/Macchina-CLI/macchina/releases/tag/v${version}";
license = with licenses; [ mit ]; license = with licenses; [ mit ];
maintainers = with maintainers; [ _414owen ]; maintainers = with maintainers; [ _414owen figsoda ];
}; };
} }

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

@ -9469,9 +9469,7 @@ with pkgs;
macchanger = callPackage ../os-specific/linux/macchanger { }; macchanger = callPackage ../os-specific/linux/macchanger { };
macchina = callPackage ../tools/misc/macchina { macchina = callPackage ../tools/misc/macchina { };
inherit (darwin.apple_sdk.frameworks) Foundation;
};
madlang = haskell.lib.compose.justStaticExecutables haskellPackages.madlang; madlang = haskell.lib.compose.justStaticExecutables haskellPackages.madlang;