Merge branch 'master'

2018-03-05 14:53:27 +01:00
parent 25a78f7234 97693915e1
commit 565bd805e6
1666 changed files with 26733 additions and 31238 deletions
@@ -4,7 +4,7 @@
 , cairo
 , curl
 , cups
-, dbus_glib
+, dbus-glib
 , dbus_libs
 , fontconfig
 , freetype
@@ -27,7 +27,7 @@
 , libXinerama
 , libXrender
 , libXt
-, libcanberra_gtk2
+, libcanberra-gtk2
 , libgnome
 , libgnomeui
 , defaultIconTheme
@@ -92,7 +92,7 @@ stdenv.mkDerivation {
      cairo
      curl
      cups
-      dbus_glib
+      dbus-glib
      dbus_libs
      fontconfig
      freetype
@@ -115,7 +115,7 @@ stdenv.mkDerivation {
      libXinerama
      libXrender
      libXt
-      libcanberra_gtk2
+      libcanberra-gtk2
      libgnome
      libgnomeui
      libGLU_combined