about summary refs log tree commit diff
path: root/pkgs/applications/audio
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-02-10 09:29:10 -0500
committerGitHub <noreply@github.com>2019-02-10 09:29:10 -0500
commit57cb5fe1f29f53aad5d2e05cf86b40bcbe23b45a (patch)
treeb627ce5a576b436bcc8720979b11ad4574e7a211 /pkgs/applications/audio
parent64edccb463432a937f00943db22a8cd36245ec27 (diff)
parentf470720aa8aa86c034eecb210b70fb0dc470e9a1 (diff)
downloadnixlib-57cb5fe1f29f53aad5d2e05cf86b40bcbe23b45a.tar
nixlib-57cb5fe1f29f53aad5d2e05cf86b40bcbe23b45a.tar.gz
nixlib-57cb5fe1f29f53aad5d2e05cf86b40bcbe23b45a.tar.bz2
nixlib-57cb5fe1f29f53aad5d2e05cf86b40bcbe23b45a.tar.lz
nixlib-57cb5fe1f29f53aad5d2e05cf86b40bcbe23b45a.tar.xz
nixlib-57cb5fe1f29f53aad5d2e05cf86b40bcbe23b45a.tar.zst
nixlib-57cb5fe1f29f53aad5d2e05cf86b40bcbe23b45a.zip
Merge pull request #55519 from FlorianFranzen/staging
Staging
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r--pkgs/applications/audio/fluidsynth/default.nix4
-rw-r--r--pkgs/applications/audio/vocal/default.nix8
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index 3eb5806aa4c1..f0fbc0bbe5c5 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -11,8 +11,8 @@ let
       sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh";
     };
     "2" = {
-      fluidsynthVersion = "2.0.2";
-      sha256 = "02vs5sfsyh1dl7wlcvgs4w3x0qcmsl7vi000qgp99ynwh3wjb274";
+      fluidsynthVersion = "2.0.3";
+      sha256 = "00f6bhw4ddrinb5flvg5y53rcvnf4km23a6nbvnswmpq13568v78";
     };
   };
 in
diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix
index 75f67adf4645..49e11aee0a12 100644
--- a/pkgs/applications/audio/vocal/default.nix
+++ b/pkgs/applications/audio/vocal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, vala_0_40, gtk3, libxml2, granite, webkitgtk, clutter-gtk
+{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, pantheon, gtk3, libxml2, webkitgtk, clutter-gtk
 , clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobject-introspection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -20,16 +20,16 @@ stdenv.mkDerivation rec {
     libxml2
     ninja
     pkgconfig
-    vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
+    pantheon.vala
     wrapGAppsHook
   ];
 
   buildInputs = with gst_all_1; [
     clutter-gst
     clutter-gtk
-    gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
+    pantheon.elementary-icon-theme
     gnome3.libgee
-    granite
+    pantheon.granite
     gst-plugins-base
     gst-plugins-good
     gstreamer