Merge remote-tracking branch 'upstream/master' into hardened-stdenv

This commit is contained in:
Robin Gloster
2016-06-10 09:27:04 +00:00
1116 changed files with 79612 additions and 24052 deletions
+5 -1
View File
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
patches = [ ./thunarx_plugins_directory.patch ];
postPatch = ''
sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c
'';
buildInputs = [
pkgconfig intltool
gtk dbus_glib libstartup_notification libnotify libexif pcre udev
@@ -35,4 +39,4 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
}