diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-04-30 15:50:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-30 15:50:24 +0200 |
commit | fd2bd6e433fee4102b81f7d233febbf26917f078 (patch) | |
tree | 021aa08cf5eb8fff6d17007ac7335b6ee0a7ae02 /pkgs/applications/audio | |
parent | d6b866e52bd5bb9bff75e0592b37a46f0f649ef7 (diff) | |
parent | 2f936f85d8e1b06de4998fa5ed4b112fd96559b1 (diff) | |
download | nixpkgs-fd2bd6e433fee4102b81f7d233febbf26917f078.tar nixpkgs-fd2bd6e433fee4102b81f7d233febbf26917f078.tar.gz nixpkgs-fd2bd6e433fee4102b81f7d233febbf26917f078.tar.bz2 nixpkgs-fd2bd6e433fee4102b81f7d233febbf26917f078.tar.lz nixpkgs-fd2bd6e433fee4102b81f7d233febbf26917f078.tar.xz nixpkgs-fd2bd6e433fee4102b81f7d233febbf26917f078.tar.zst nixpkgs-fd2bd6e433fee4102b81f7d233febbf26917f078.zip |
Merge staging-next into master
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/radiotray-ng/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/sonata/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/sound-juicer/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 1838268a0ea..91d82d686d0 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -10,7 +10,7 @@ # GUI/Desktop , dbus , glibmm -, gnome3 +, gsettings-desktop-schemas , hicolor-icon-theme , libappindicator-gtk3 , libnotify @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl boost jsoncpp libbsd pcre - glibmm hicolor-icon-theme gnome3.gsettings-desktop-schemas libappindicator-gtk3 libnotify + glibmm hicolor-icon-theme gsettings-desktop-schemas libappindicator-gtk3 libnotify libxdg_basedir lsb-release wxGTK diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 5c22e3e7751..d5985f097e9 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook -, python3Packages, gnome3, gtk3, gobject-introspection}: +, python3Packages, gnome3, gtk3, gsettings-desktop-schemas, gobject-introspection }: let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2; @@ -20,7 +20,7 @@ in buildPythonApplication rec { buildInputs = [ intltool wrapGAppsHook gnome3.adwaita-icon-theme - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 303532aca63..7f22a03c1bb 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero , libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes -, wrapGAppsHook }: +, gsettings-desktop-schemas, wrapGAppsHook }: let pname = "sound-juicer"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme - gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes + gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-libav |