diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index a73744ebbe85..9e0b50b5c0dc 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,18 +1,18 @@ -{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm, libsigcxx -, libglademm, libcanberra, intltool, gettext }: +{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm3 +, libcanberra_gtk3, intltool, gettext }: stdenv.mkDerivation rec { - name = "pavucontrol-1.0"; + name = "pavucontrol-2.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz"; - sha256 = "1plcyrc7p6gqxjhxx2xh6162bkb29wixjrqrjnl9b8g3nrjjigix"; + sha256 = "02s775m1531sshwlbvfddk3pz8zjmwkv1sgzggn386ja3gc9vwi2"; }; - buildInputs = [ pkgconfig pulseaudio gtkmm libsigcxx libglademm libcanberra + buildInputs = [ pkgconfig pulseaudio gtkmm3 libcanberra_gtk3 intltool gettext ]; - configureFlags = "--disable-lynx --disable-gtk3"; + configureFlags = "--disable-lynx"; meta = { description = "PulseAudio Volume Control"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { easily control the volume of all clients, sinks, etc. ''; - homepage = http://0pointer.de/lennart/projects/pavucontrol/; + homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/ ; license = "GPLv2+"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 760a84c48a29..eff36f43d6be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4433,6 +4433,7 @@ let libcaca = callPackage ../development/libraries/libcaca { }; libcanberra = callPackage ../development/libraries/libcanberra { }; + libcanberra_gtk3 = libcanberra.override { gtk = gtk3; }; libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true) then libcanberra.override { gtk = null; } else libcanberra; @@ -8192,9 +8193,7 @@ let panotools = callPackage ../applications/graphics/panotools { }; - pavucontrol = callPackage ../applications/audio/pavucontrol { - inherit (gnome) libglademm; - }; + pavucontrol = callPackage ../applications/audio/pavucontrol { }; paraview = callPackage ../applications/graphics/paraview { };