diff options
| author | Johannes Frankenau <johannes@frankenau.net> | 2018-07-16 20:51:05 +0200 |
|---|---|---|
| committer | Johannes Frankenau <johannes@frankenau.net> | 2018-07-16 20:55:21 +0200 |
| commit | 06e0a518d160d4fa21a64a7f5ac1737378aed6d7 (patch) | |
| tree | df7406ff80abb9c3004f14e831d51d2a1b36e5ae /pkgs/applications/misc/viking | |
| parent | e0936ff6e36a3508fe197161596580770dfcedd5 (diff) | |
| download | nixpkgs-06e0a518d160d4fa21a64a7f5ac1737378aed6d7.tar nixpkgs-06e0a518d160d4fa21a64a7f5ac1737378aed6d7.tar.gz nixpkgs-06e0a518d160d4fa21a64a7f5ac1737378aed6d7.tar.bz2 nixpkgs-06e0a518d160d4fa21a64a7f5ac1737378aed6d7.tar.lz nixpkgs-06e0a518d160d4fa21a64a7f5ac1737378aed6d7.tar.xz nixpkgs-06e0a518d160d4fa21a64a7f5ac1737378aed6d7.tar.zst nixpkgs-06e0a518d160d4fa21a64a7f5ac1737378aed6d7.zip | |
viking: depend on hicolor-icon-theme
This avoids conflicts on `share/icons/hicolor/icon-theme.cache`.
Diffstat (limited to 'pkgs/applications/misc/viking')
| -rw-r--r-- | pkgs/applications/misc/viking/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index d090878f976..b7d0b330e85 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -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" ]; |