diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-01-23 11:31:13 +0100 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-01-23 11:31:13 +0100 |
| commit | eddfcc32b4cbfd4a158d690b3c35c0cda8a5f8ed (patch) | |
| tree | 414bb33ccff27e022cfcdcf03e88b00f787344a7 /pkgs/applications/audio | |
| parent | 91b7e73bbcb688e4b7de44752ebaee892d6fa31b (diff) | |
| parent | cdfb32d17a988c9fe2952c586f7ea8c2b6ca7115 (diff) | |
| download | nixlib-eddfcc32b4cbfd4a158d690b3c35c0cda8a5f8ed.tar nixlib-eddfcc32b4cbfd4a158d690b3c35c0cda8a5f8ed.tar.gz nixlib-eddfcc32b4cbfd4a158d690b3c35c0cda8a5f8ed.tar.bz2 nixlib-eddfcc32b4cbfd4a158d690b3c35c0cda8a5f8ed.tar.lz nixlib-eddfcc32b4cbfd4a158d690b3c35c0cda8a5f8ed.tar.xz nixlib-eddfcc32b4cbfd4a158d690b3c35c0cda8a5f8ed.tar.zst nixlib-eddfcc32b4cbfd4a158d690b3c35c0cda8a5f8ed.zip | |
Merge branch 'staging' into glibc230
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/pavucontrol/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/audio/spotifyd/default.nix | 6 |
2 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index fee86cb5bcae..d07cf8a476b5 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3 -, libcanberra-gtk3, makeWrapper, gnome3 }: +, libcanberra-gtk3, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pavucontrol"; @@ -10,16 +10,10 @@ stdenv.mkDerivation rec { sha256 = "1qhlkl3g8d7h72xjskii3g1l7la2cavwp69909pzmbi2jyn5pi4g"; }; - preFixup = '' - wrapProgram "$out/bin/pavucontrol" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" - ''; - - buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper + buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 gnome3.adwaita-icon-theme ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; configureFlags = [ "--disable-lynx" ]; diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 36ab017c5cbb..b80638110306 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "spotifyd"; - version = "0.2.20"; + version = "0.2.23"; src = fetchFromGitHub { owner = "Spotifyd"; repo = "spotifyd"; rev = "v${version}"; - sha256 = "1hf4wpk7r0s4jpjhxaz67y1hd8jx9ns5imd85r3cdg4lxf3j5gph"; + sha256 = "0xxr21avgr4pvlr5vgb68jmad5xy5kqvaxfzh0qn1jpiax7y3avm"; }; - cargoSha256 = "1h3fis47hmxvppiv1icjhgp48nd46gayfcmzfjs34q6jask90n0w"; + cargoSha256 = "1ykmn7zzwn9my96bbxwkparab5lck1zzdkpafil2mmrjyvyi40da"; cargoBuildFlags = [ "--no-default-features" |