public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #43633 from jfrankenau/fix-icon-cache

Browse Source 
pulseeffects, lightdm-gtk-greeter, gxmessage, viking: depend on hicolor-icon-theme
This commit is contained in:
Jan Tojnar
2018-08-16 09:30:11 +02:00
committed by GitHub
parent d80fb9a99e 06e0a518d1
commit a82ea67994
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/pulseeffects/default.nix
+2
View File
@@ -29,6 +29,7 @@
, zam-plugins , zam-plugins
, rubberband , rubberband
, mda_lv2 , mda_lv2
, hicolor-icon-theme
}: }:
let let
@@ -79,6 +80,7 @@ in stdenv.mkDerivation rec {
boost boost
fftwFloat fftwFloat
zita-convolver zita-convolver
hicolor-icon-theme
]; ];
postPatch = '' postPatch = ''
pkgs/applications/display-managers/lightdm/gtk-greeter.nix
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ lightdm exo intltool makeWrapper ] buildInputs = [ lightdm exo intltool makeWrapper hicolor-icon-theme ]
++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);
configureFlags = [ configureFlags = [
pkgs/applications/misc/gxmessage/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo}: { stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gxmessage-${version}"; name = "gxmessage-${version}";
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool gnome3.gtk texinfo ]; buildInputs = [ intltool gnome3.gtk texinfo hicolor-icon-theme ];
meta = { meta = {
description = "A GTK enabled dropin replacement for xmessage"; description = "A GTK enabled dropin replacement for xmessage";
homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"; homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage";
pkgs/applications/misc/viking/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl
, gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper , 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 { stdenv.mkDerivation rec {
name = "viking-${version}"; name = "viking-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils 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" ]; configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ];