mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 07:31:26 +00:00
Merge pull request #43633 from jfrankenau/fix-icon-cache
pulseeffects, lightdm-gtk-greeter, gxmessage, viking: depend on hicolor-icon-theme
This commit is contained in:
commit
a82ea67994
@ -29,6 +29,7 @@
|
||||
, zam-plugins
|
||||
, rubberband
|
||||
, mda_lv2
|
||||
, hicolor-icon-theme
|
||||
}:
|
||||
|
||||
let
|
||||
@ -79,6 +80,7 @@ in stdenv.mkDerivation rec {
|
||||
boost
|
||||
fftwFloat
|
||||
zita-convolver
|
||||
hicolor-icon-theme
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ lightdm exo intltool makeWrapper ]
|
||||
buildInputs = [ lightdm exo intltool makeWrapper hicolor-icon-theme ]
|
||||
++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);
|
||||
|
||||
configureFlags = [
|
||||
|
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo}:
|
||||
{ stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo, hicolor-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gxmessage-${version}";
|
||||
@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ intltool gnome3.gtk texinfo ];
|
||||
buildInputs = [ intltool gnome3.gtk texinfo hicolor-icon-theme ];
|
||||
|
||||
meta = {
|
||||
description = "A GTK enabled dropin replacement for xmessage";
|
||||
homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage";
|
||||
|
@ -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" ];
|
||||
|
Loading…
Reference in New Issue
Block a user