termusic: 0.7.10 -> 0.7.11 (#247425)

* termusic: 0.7.10 -> 0.7.11

* termusic: sort attributes alphabetically, remove `with lib;`

* termusic: fix builds on Darwin

* termusic: fix builds on Darwin

* termusic: fix builds on x86_64 Darwin

* termusic: fix builds on Darwin

* Revert "termusic: fix builds on Darwin"

This reverts commit 90670409e9e3c9bcea18335e91f414cf038525b5.
This reverts commit f137ccf1094714b6f0f88b775771c6d826fc2736.

* termusic: fix builds on Darwin

* termusic: fix builds on Darwin

---------

Co-authored-by: Pol Dellaiera <pol.dellaiera@protonmail.com>

authored by

VuiMuich
Pol Dellaiera
and committed by
GitHub
91eae856 11717e91

+48 -19
+45 -18
pkgs/applications/audio/termusic/default.nix
··· 1 - { lib 2 - , stdenv 3 - , rustPlatform 4 - , fetchCrate 5 - , fetchpatch 1 + { 2 + alsa-lib 3 + , AppKit 4 + , CoreAudio 5 + , CoreGraphics 6 + , dbus 7 + , Foundation 8 + , fetchFromGitHub 9 + , glib 10 + , gst_all_1 11 + , IOKit 12 + , lib 13 + , MediaPlayer 14 + , openssl 6 15 , pkg-config 7 - , alsa-lib 8 - , darwin 16 + , protobuf 17 + , rustPlatform 18 + , Security 19 + , sqlite 20 + , stdenv 9 21 }: 10 22 11 23 rustPlatform.buildRustPackage rec { 12 24 pname = "termusic"; 13 - version = "0.7.10"; 25 + version = "0.7.11"; 14 26 15 - src = fetchCrate { 16 - inherit pname version; 17 - hash = "sha256-m0hi5u4BcRcEDEpg1BoWXc25dfhD6+OJtqSZfSdV0HM="; 27 + src = fetchFromGitHub { 28 + owner = "tramhao"; 29 + repo = "termusic"; 30 + rev = "v${version}"; 31 + hash = "sha256-ykOBXM/WF+zasAt+6mgY2aSFCpGaYcqk+YI7YLM3MWs="; 18 32 }; 19 33 20 - cargoHash = "sha256-A83gLsaPm6t4nm7DJfcp9z1huDU/Sfy9gunP8pzBiCA="; 34 + cargoHash = "sha256-BrOpU0RFdlRXQIMjfHfs/XYIdBCYKFSA+5by/rGzC8Y="; 21 35 22 36 nativeBuildInputs = [ 23 37 pkg-config 38 + protobuf 24 39 rustPlatform.bindgenHook 25 40 ]; 26 41 27 - buildInputs = lib.optionals stdenv.isLinux [ 42 + buildInputs = [ 43 + dbus 44 + glib 45 + gst_all_1.gstreamer 46 + openssl 47 + sqlite 48 + ] ++ lib.optionals stdenv.isDarwin [ 49 + AppKit 50 + CoreAudio 51 + CoreGraphics 52 + Foundation 53 + IOKit 54 + MediaPlayer 55 + Security 56 + ] ++ lib.optionals stdenv.isLinux [ 28 57 alsa-lib 29 - ] ++ lib.optionals stdenv.isDarwin [ 30 - darwin.apple_sdk.frameworks.AudioUnit 31 58 ]; 32 59 33 - meta = with lib; { 60 + meta = { 34 61 description = "Terminal Music Player TUI written in Rust"; 35 62 homepage = "https://github.com/tramhao/termusic"; 36 - license = with licenses; [ gpl3Only ]; 37 - maintainers = with maintainers; [ devhell ]; 63 + license = with lib.licenses; [ gpl3Only ]; 64 + maintainers = with lib.maintainers; [ devhell ]; 38 65 }; 39 66 }
+3 -1
pkgs/top-level/all-packages.nix
··· 1944 1944 1945 1945 tere = callPackage ../tools/misc/tere { }; 1946 1946 1947 - termusic = callPackage ../applications/audio/termusic { }; 1947 + termusic = darwin.apple_sdk_11_0.callPackage ../applications/audio/termusic { 1948 + inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security; 1949 + }; 1948 1950 1949 1951 tfk8s = callPackage ../tools/misc/tfk8s { }; 1950 1952