Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2018-07-21 19:43:53 +02:00
2090 changed files with 4329 additions and 3730 deletions
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, xfce4-panel, libxfce4util, gtk, libsoup
, makeWrapper, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }:
, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
p_name = "xfce4-screenshooter";
+1 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit
{ stdenv, fetchurl, pkgconfig, intltool, gtk, polkit
, libxfce4util, libxfce4ui, xfce4-panel, libwnck, dbus-glib, xfconf, libglade, xorg
, hicolor-icon-theme
}:
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, substituteAll, cmake, vala, glib, gtk2, gtk3 }:
{ stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }:
stdenv.mkDerivation rec {
name = "vala-panel-appmenu-xfce-${version}";
version = "0.6.94";