3
0
Fork 0
forked from mirrors/nixpkgs

viking: depend on hicolor-icon-theme

This avoids conflicts on `share/icons/hicolor/icon-theme.cache`.
This commit is contained in:
Johannes Frankenau 2018-07-16 20:51:05 +02:00
parent e0936ff6e3
commit 06e0a518d1

View file

@ -1,6 +1,6 @@
{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl
, gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper
, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }:
, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme }:
stdenv.mkDerivation rec {
name = "viking-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite hicolor-icon-theme
];
configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ];