Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

spotify-tui: 0.9.0 -> 0.10.0 #74739

Merged
merged 1 commit into from Nov 30, 2019
Merged

Conversation

jwijenbergh
Copy link
Contributor

@jwijenbergh jwijenbergh commented Nov 30, 2019

Motivation for this change

Update to version 0.10.0. Has clipboard support so we need libxcb (on linux) and python (for building rust-xcb).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @


nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ]
buildInputs = [ openssl python3 ]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please move python3 to nativeBuildInputs. Besides that, LGTM

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yeah, fixed.

@marsam
Copy link
Contributor

marsam commented Nov 30, 2019

would you mind adding the following for the darwin build?

diff --git c/pkgs/applications/audio/spotify-tui/default.nix i/pkgs/applications/audio/spotify-tui/default.nix
index a1ec474c217..264ab73e6a5 100644
--- c/pkgs/applications/audio/spotify-tui/default.nix
+++ i/pkgs/applications/audio/spotify-tui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, python3, libxcb, Security }:
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, python3, libxcb, AppKit, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "spotify-tui";
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl python3 ]
   	++ stdenv.lib.optional stdenv.isLinux libxcb
-    ++ stdenv.lib.optional stdenv.isDarwin Security;
+    ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ];
 
   meta = with stdenv.lib; {
     description = "Spotify for the terminal written in Rust";
diff --git c/pkgs/top-level/all-packages.nix i/pkgs/top-level/all-packages.nix
index 3db18945819..4f124b36938 100644
--- c/pkgs/top-level/all-packages.nix
+++ i/pkgs/top-level/all-packages.nix
@@ -21109,7 +21109,7 @@ in
   split2flac = callPackage ../applications/audio/split2flac { };
 
   spotify-tui = callPackage ../applications/audio/spotify-tui {
-    inherit (darwin.apple_sdk.frameworks) Security;
+    inherit (darwin.apple_sdk.frameworks) AppKit Security;
   };
 
   squishyball = callPackage ../applications/audio/squishyball {

@jwijenbergh
Copy link
Contributor Author

would you mind adding the following for the darwin build?

Patch applied, thanks 👍

@marsam marsam merged commit bc7734d into NixOS:master Nov 30, 2019
@marsam
Copy link
Contributor

marsam commented Nov 30, 2019

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants