Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a2d9f5843336
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ad4eebc5ca8d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 18, 2020

  1. spotifyd: add withMpris and withKeyring optionals

    @bbigras
    bbigras committed Apr 18, 2020
    Copy the full SHA
    11be0cd View commit details

Commits on Apr 19, 2020

  1. Merge pull request #85471 from bbigras/spotifyd 

    spotifyd: add withMpris and withKeyring optionals
    @marsam
    marsam authored Apr 19, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ad4eebc View commit details
Showing with 6 additions and 2 deletions.
  1. +6 −2 pkgs/applications/audio/spotifyd/default.nix
8 changes: 6 additions & 2 deletions pkgs/applications/audio/spotifyd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,9 @@
, withALSA ? true, alsaLib ? null
, withPulseAudio ? false, libpulseaudio ? null
, withPortAudio ? false, portaudio ? null
, withMpris ? false
, withKeyring ? false
, dbus ? null
}:

rustPlatform.buildRustPackage rec {
@@ -20,15 +23,16 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [
"--no-default-features"
"--features"
"${stdenv.lib.optionalString withALSA "alsa_backend,"}${stdenv.lib.optionalString withPulseAudio "pulseaudio_backend,"}${stdenv.lib.optionalString withPortAudio "portaudio_backend,"}"
"${stdenv.lib.optionalString withALSA "alsa_backend,"}${stdenv.lib.optionalString withPulseAudio "pulseaudio_backend,"}${stdenv.lib.optionalString withPortAudio "portaudio_backend,"}${stdenv.lib.optionalString withMpris "dbus_mpris,"}${stdenv.lib.optionalString withKeyring "dbus_keyring,"}"
];

nativeBuildInputs = [ pkgconfig ];

buildInputs = [ openssl ]
++ stdenv.lib.optional withALSA alsaLib
++ stdenv.lib.optional withPulseAudio libpulseaudio
++ stdenv.lib.optional withPortAudio portaudio;
++ stdenv.lib.optional withPortAudio portaudio
++ stdenv.lib.optional (withMpris || withKeyring) dbus;

doCheck = false;