diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-01-22 05:04:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 05:04:30 -0500 |
| commit | 9613cc810491d88531531f56b56ebad31e52051c (patch) | |
| tree | 28f2d7a1b11d960672684de5a819ff72d874e1e1 /pkgs | |
| parent | 546fe02875de012f3a0adae465c4e8da6dad6c9f (diff) | |
| parent | a06cbffd16a7e65998dca6729770fb4bef04ab43 (diff) | |
| download | nixpkgs-9613cc810491d88531531f56b56ebad31e52051c.tar nixpkgs-9613cc810491d88531531f56b56ebad31e52051c.tar.gz nixpkgs-9613cc810491d88531531f56b56ebad31e52051c.tar.bz2 nixpkgs-9613cc810491d88531531f56b56ebad31e52051c.tar.lz nixpkgs-9613cc810491d88531531f56b56ebad31e52051c.tar.xz nixpkgs-9613cc810491d88531531f56b56ebad31e52051c.tar.zst nixpkgs-9613cc810491d88531531f56b56ebad31e52051c.zip | |
Merge pull request #78230 from r-ryantm/auto-update/mcfly
mcfly: 0.3.1 -> 0.3.6
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/mcfly/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 4ea27ce092f..7d85e709f73 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -1,20 +1,20 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ stdenv, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.3.1"; + version = "0.3.6"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "0pmyw21zns4zn7pffji4yvbj63fx3g15cx81pk4bs6lzyz5zbdc2"; + sha256 = "1g3n7ll0yg7w7hb3jgp25mlnqwsdzv0608f41z7q5gmsskdm3v1j"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + preInstall = '' - mkdir -p $out/share/mcfly - cp mcfly.bash $out/share/mcfly/ - chmod +x $out/share/mcfly/mcfly.bash + install -Dm644 -t $out/share/mcfly mcfly.bash ''; cargoSha256 = "1bf65kagvhsi6lg8187ihi5j45hkq9d8v6j7rzmmfhngdzvcfr69"; @@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec { homepage = https://github.com/cantino/mcfly; description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now."; license = licenses.mit; - platforms = platforms.linux; maintainers = [ maintainers.melkor333 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06fb9280723..4bf3a79f263 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4544,7 +4544,9 @@ in mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; - mcfly = callPackage ../tools/misc/mcfly { }; + mcfly = callPackage ../tools/misc/mcfly { + inherit (darwin.apple_sdk.frameworks) Security; + }; mdbook = callPackage ../tools/text/mdbook { inherit (darwin.apple_sdk.frameworks) CoreServices; |