Merge branch 'staging-next'

It's not perfect, but I think we can deal with the rest of the
regressions directly on master, so that this process does not stall.
This commit is contained in:
Vladimír Čunát 2019-10-13 15:50:37 +02:00
commit 4e6826a3b2
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
220 changed files with 3185 additions and 2178 deletions

View file

@ -32,7 +32,11 @@
<title>Icons</title> <title>Icons</title>
<para> <para>
When an application uses icons, an icon theme should be available in <envar>XDG_DATA_DIRS</envar>. The package for the default, icon-less <link xlink:href="https://www.freedesktop.org/wiki/Software/icon-theme/">hicolor-icon-theme</link> contains <link linkend="ssec-gnome-hooks-hicolor-icon-theme">a setup hook</link> that will pick up icon themes from <literal>buildInputs</literal> and pass it to our wrapper. Unfortunately, relying on that would mean every user has to download the theme included in the package expression no matter their preference. For that reason, we leave the installation of icon theme on the user. If you use one of the desktop environments, you probably already have an icon theme installed. When an application uses icons, an icon theme should be available in <envar>XDG_DATA_DIRS</envar> during runtime. The package for the default, icon-less <link xlink:href="https://www.freedesktop.org/wiki/Software/icon-theme/">hicolor-icon-theme</link> (should be propagated by every icon theme) contains <link linkend="ssec-gnome-hooks-hicolor-icon-theme">a setup hook</link> that will pick up icon themes from <literal>buildInputs</literal> and pass it to our wrapper. Unfortunately, relying on that would mean every user has to download the theme included in the package expression no matter their preference. For that reason, we leave the installation of icon theme on the user. If you use one of the desktop environments, you probably already have an icon theme installed.
</para>
<para>
To avoid costly file system access when locating icons, GTK, <link xlink:href="https://woboq.com/blog/qicon-reads-gtk-icon-cache-in-qt57.html">as well as Qt</link>, can rely on <filename>icon-theme.cache</filename> files from the themes top-level directories. These files are generated using <command>gtk-update-icon-cache</command>, which is expected to be run whenever an icon is added or removed to an icon theme (typically an application icon into <literal>hicolor</literal> theme) and some programs do indeed run this after icon installation. However, since packages are installed into their own prefix by Nix, this would lead to conflicts. For that reason, <package>gtk3</package> provides a <link xlink:href="#ssec-gnome-hooks-gtk-drop-icon-theme-cache">setup hook</link> that will clean the file from installation. Since most applications only ship their own icon that will be loaded on start-up, it should not affect them too much. On the other hand, icon themes are much larger and more widely used so we need to cache them. Because we recommend installing icon themes globally, we will generate the cache files from all packages in a profile using a NixOS module. You can enable the cache generation using <option>gtk.iconCache.enable</option> option if your desktop environment does not already do that.
</para> </para>
</section> </section>
@ -91,6 +95,11 @@ preFixup = ''
<package>glib</package> setup hook will populate <envar>GSETTINGS_SCHEMAS_PATH</envar> and then <package>wrapGAppsHook</package> will prepend it to <envar>XDG_DATA_DIRS</envar>. <package>glib</package> setup hook will populate <envar>GSETTINGS_SCHEMAS_PATH</envar> and then <package>wrapGAppsHook</package> will prepend it to <envar>XDG_DATA_DIRS</envar>.
</para> </para>
</listitem> </listitem>
<listitem xml:id="ssec-gnome-hooks-gtk-drop-icon-theme-cache">
<para>
One of <package>gtk3</package>s setup hooks will remove <filename>icon-theme.cache</filename> files from packages icon theme directories to avoid conflicts. Icon theme packages should prevent this with <code>dontDropIconThemeCache = true;</code>.
</para>
</listitem>
<listitem xml:id="ssec-gnome-hooks-dconf"> <listitem xml:id="ssec-gnome-hooks-dconf">
<para> <para>
<package>gnome3.dconf.lib</package> is a dependency of <package>wrapGAppsHook</package>, which then also adds it to the <envar>GIO_EXTRA_MODULES</envar> variable. <package>gnome3.dconf.lib</package> is a dependency of <package>wrapGAppsHook</package>, which then also adds it to the <envar>GIO_EXTRA_MODULES</envar> variable.

View file

@ -331,6 +331,17 @@ in
''; '';
}; };
package = mkOption {
type = types.package;
default = pkgs.iptables;
defaultText = "pkgs.iptables";
example = literalExample "pkgs.iptables-nftables-compat";
description =
''
The iptables package to use for running the firewall service."
'';
};
logRefusedConnections = mkOption { logRefusedConnections = mkOption {
type = types.bool; type = types.bool;
default = true; default = true;
@ -536,7 +547,7 @@ in
networking.firewall.trustedInterfaces = [ "lo" ]; networking.firewall.trustedInterfaces = [ "lo" ];
environment.systemPackages = [ pkgs.iptables ] ++ cfg.extraPackages; environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages;
boot.kernelModules = (optional cfg.autoLoadConntrackHelpers "nf_conntrack") boot.kernelModules = (optional cfg.autoLoadConntrackHelpers "nf_conntrack")
++ map (x: "nf_conntrack_${x}") cfg.connectionTrackingModules; ++ map (x: "nf_conntrack_${x}") cfg.connectionTrackingModules;
@ -555,7 +566,7 @@ in
before = [ "network-pre.target" ]; before = [ "network-pre.target" ];
after = [ "systemd-modules-load.service" ]; after = [ "systemd-modules-load.service" ];
path = [ pkgs.iptables ] ++ cfg.extraPackages; path = [ cfg.package ] ++ cfg.extraPackages;
# FIXME: this module may also try to load kernel modules, but # FIXME: this module may also try to load kernel modules, but
# containers don't have CAP_SYS_MODULE. So the host system had # containers don't have CAP_SYS_MODULE. So the host system had

View file

@ -202,7 +202,7 @@ in {
dhcp = mkOption { dhcp = mkOption {
type = types.enum [ "dhclient" "dhcpcd" "internal" ]; type = types.enum [ "dhclient" "dhcpcd" "internal" ];
default = "dhclient"; default = "internal";
description = '' description = ''
Which program (or internal library) should be used for DHCP. Which program (or internal library) should be used for DHCP.
''; '';

View file

@ -11,8 +11,8 @@ let
sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh"; sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh";
}; };
"2" = { "2" = {
fluidsynthVersion = "2.0.5"; fluidsynthVersion = "2.0.6";
sha256 = "0rv0apxbj0cgm8f8sqf5xr6kdi4q58ph92ip6cg716ha0ca5lr8y"; sha256 = "0nas9pp9r8rnziznxm65x2yzf1ryg98zr3946g0br3s38sjf8l3a";
}; };
}; };
in in

View file

@ -11,7 +11,6 @@
, appstream-glib , appstream-glib
, desktop-file-utils , desktop-file-utils
, totem-pl-parser , totem-pl-parser
, hicolor-icon-theme
, gobject-introspection , gobject-introspection
, wrapGAppsHook , wrapGAppsHook
, lastFMSupport ? true , lastFMSupport ? true
@ -51,7 +50,6 @@ python3.pkgs.buildPythonApplication rec {
gst-plugins-ugly gst-plugins-ugly
gstreamer gstreamer
gtk3 gtk3
hicolor-icon-theme
libsoup libsoup
totem-pl-parser totem-pl-parser
] ++ lib.optional lastFMSupport libsecret; ] ++ lib.optional lastFMSupport libsecret;

View file

@ -32,7 +32,6 @@
, rubberband , rubberband
, mda_lv2 , mda_lv2
, lsp-plugins , lsp-plugins
, hicolor-icon-theme
}: }:
let let
@ -86,7 +85,6 @@ in stdenv.mkDerivation rec {
dbus dbus
fftwFloat fftwFloat
zita-convolver zita-convolver
hicolor-icon-theme
]; ];
postPatch = '' postPatch = ''

View file

@ -53,6 +53,11 @@ stdenv.mkDerivation rec {
url = "https://src.fedoraproject.org/rpms/lightdm/raw/4cf0d2bed8d1c68970b0322ccd5dbbbb7a0b12bc/f/lightdm-1.25.1-disable_dmrc.patch"; url = "https://src.fedoraproject.org/rpms/lightdm/raw/4cf0d2bed8d1c68970b0322ccd5dbbbb7a0b12bc/f/lightdm-1.25.1-disable_dmrc.patch";
sha256 = "06f7iabagrsiws2l75sx2jyljknr9js7ydn151p3qfi104d1541n"; sha256 = "06f7iabagrsiws2l75sx2jyljknr9js7ydn151p3qfi104d1541n";
}) })
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://github.com/canonical/lightdm/commit/a99376f5f51aa147aaf81287d7ce70db76022c47.patch";
sha256 = "1zyx1qqajrmqcf9hbsapd39gmdanswd9l78rq7q6rdy4692il3yn";
})
]; ];
preConfigure = "NOCONFIGURE=1 ./autogen.sh"; preConfigure = "NOCONFIGURE=1 ./autogen.sh";

View file

@ -46,6 +46,7 @@ in mkDerivation {
"-DQT_IMPORTS_DIR=${placeholder "out"}/${qtbase.qtQmlPrefix}" "-DQT_IMPORTS_DIR=${placeholder "out"}/${qtbase.qtQmlPrefix}"
"-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc" "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc"
"-DSYSTEMD_SYSTEM_UNIT_DIR=${placeholder "out"}/lib/systemd/system" "-DSYSTEMD_SYSTEM_UNIT_DIR=${placeholder "out"}/lib/systemd/system"
"-DDBUS_CONFIG_DIR=${placeholder "out"}/share/dbus-1/system.d"
]; ];
postInstall = '' postInstall = ''

View file

@ -13,7 +13,6 @@
, gtk-doc , gtk-doc
, gtk3 , gtk3
, gtksourceview4 , gtksourceview4
, hicolor-icon-theme
, json-glib , json-glib
, jsonrpc-glib , jsonrpc-glib
, libdazzle , libdazzle
@ -53,7 +52,6 @@ stdenv.mkDerivation rec {
docbook_xml_dtd_43 docbook_xml_dtd_43
gobject-introspection gobject-introspection
gtk-doc gtk-doc
hicolor-icon-theme
(meson.override ({ inherit stdenv; })) (meson.override ({ inherit stdenv; }))
ninja ninja
pkgconfig pkgconfig

View file

@ -1,6 +1,6 @@
{ stdenv, makeDesktopItem, fetchurl, unzip { stdenv, makeDesktopItem, fetchurl, unzip
, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3 , gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
, xorg, mozjpeg, makeWrapper, wrapGAppsHook, hicolor-icon-theme, libuuid, at-spi2-core , xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [makeWrapper wrapGAppsHook]; nativeBuildInputs = [makeWrapper wrapGAppsHook];
buildInputs = [ unzip gtk3 gnome3.adwaita-icon-theme hicolor-icon-theme ]; buildInputs = [ unzip gtk3 gnome3.adwaita-icon-theme ];
# src is producing multiple folder on unzip so we must # src is producing multiple folder on unzip so we must
# override unpackCmd to extract it into newly created folder # override unpackCmd to extract it into newly created folder

View file

@ -1,6 +1,6 @@
{ stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perlPackages, { stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perlPackages,
libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme, libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui,
gtk-mac-integration-gtk2 }: gtk-mac-integration-gtk2 }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -15,7 +15,7 @@ stdenv.mkDerivation {
buildInputs = buildInputs =
[ gtk2 libxml2 gettext python libxml2Python docbook5 [ gtk2 libxml2 gettext python libxml2Python docbook5
libxslt docbook_xsl libart_lgpl hicolor-icon-theme ] libxslt docbook_xsl libart_lgpl ]
++ stdenv.lib.optional withGNOME libgnomeui ++ stdenv.lib.optional withGNOME libgnomeui
++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration-gtk2; ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration-gtk2;

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, barcode, gnome3, autoreconfHook { stdenv, fetchurl, barcode, gnome3, autoreconfHook
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas
, intltool, itstool, makeWrapper, pkgconfig, hicolor-icon-theme , intltool, itstool, makeWrapper, pkgconfig
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
barcode gtk3 gtk-doc gnome3.yelp-tools barcode gtk3 gtk-doc gnome3.yelp-tools
gnome3.gnome-common gsettings-desktop-schemas gnome3.gnome-common gsettings-desktop-schemas
itstool libxml2 librsvg libe-book libtool itstool libxml2 librsvg libe-book libtool
hicolor-icon-theme
]; ];
preFixup = '' preFixup = ''

View file

@ -12,7 +12,6 @@
, pantheon , pantheon
, desktop-file-utils , desktop-file-utils
, xorg , xorg
, hicolor-icon-theme
, wrapGAppsHook , wrapGAppsHook
}: }:
@ -29,7 +28,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
desktop-file-utils desktop-file-utils
hicolor-icon-theme # for setup-hook
meson meson
ninja ninja
vala vala

View file

@ -2,7 +2,7 @@
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
, gsl, python2, poppler, imagemagick, libwpg, librevenge , gsl, python2, poppler, imagemagick, libwpg, librevenge
, libvisio, libcdr, libexif, potrace, cmake, hicolor-icon-theme , libvisio, libcdr, libexif, potrace, cmake
, librsvg, wrapGAppsHook , librsvg, wrapGAppsHook
}: }:
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
libXft libpng zlib popt boehmgc libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
gsl poppler imagemagick libwpg librevenge gsl poppler imagemagick libwpg librevenge
libvisio libcdr libexif potrace hicolor-icon-theme libvisio libcdr libexif potrace
librsvg # for loading icons librsvg # for loading icons

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, gobject-introspection, hicolor-icon-theme { stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, gobject-introspection
, gdk-pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }: , gdk-pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }:
let let
@ -21,7 +21,7 @@ in stdenv.mkDerivation {
]; ];
buildInputs = [ buildInputs = [
gtk3 gdk-pixbuf json_c lcms2 libpng librsvg pycairo pygobject3 python hicolor-icon-theme gtk3 gdk-pixbuf json_c lcms2 libpng librsvg pycairo pygobject3 python
]; ];
propagatedBuildInputs = [ numpy ]; propagatedBuildInputs = [ numpy ];

View file

@ -1,5 +1,5 @@
{ lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead { lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead
, hicolor-icon-theme, gnome3 , gnome3
# Test requirements # Test requirements
, dbus, xvfb_run, xdotool , dbus, xvfb_run, xdotool
@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
''; '';
checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ];
buildInputs = [ hicolor-icon-theme gnome3.adwaita-icon-theme librsvg ]; buildInputs = [ gnome3.adwaita-icon-theme librsvg ];
propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];
makeWrapperArgs = [ makeWrapperArgs = [

View file

@ -10,7 +10,6 @@
, glib , glib
, gsettings-desktop-schemas , gsettings-desktop-schemas
, gtk3 , gtk3
, hicolor-icon-theme
, libsndfile , libsndfile
, libxml2 , libxml2
, libzip , libzip
@ -38,7 +37,6 @@ stdenv.mkDerivation rec {
[ glib [ glib
gsettings-desktop-schemas gsettings-desktop-schemas
gtk3 gtk3
hicolor-icon-theme
libsndfile libsndfile
libxml2 libxml2
libzip libzip

View file

@ -15,8 +15,8 @@ mkDerivation {
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ libgit2 ]; buildInputs = [
propagatedBuildInputs = [ libgit2
kactivities ki18n kio ktexteditor kwindowsystem plasma-framework kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver

View file

@ -1,5 +1,5 @@
{ {
mkDerivation, lib, makeWrapper, mkDerivation, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications, ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
@ -18,12 +18,7 @@ mkDerivation {
kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support
kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty
kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff
makeWrapper
]; ];
postInstall = ''
wrapProgram $out/bin/konsole --prefix XDG_DATA_DIRS ":" $out/share
'';
propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
} }

View file

@ -9,7 +9,6 @@
, gettext , gettext
, glib , glib
, gtk3 , gtk3
, hicolor-icon-theme
, libgee , libgee
, wrapGAppsHook }: , wrapGAppsHook }:
@ -37,7 +36,6 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib glib
gtk3 gtk3
hicolor-icon-theme
pantheon.granite pantheon.granite
libgee libgee
]; ];

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor-icon-theme }: { fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clipit"; pname = "clipit";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool gtk2 xdotool hicolor-icon-theme ]; buildInputs = [ intltool gtk2 xdotool ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Lightweight GTK Clipboard Manager"; description = "Lightweight GTK Clipboard Manager";

View file

@ -1,22 +1,34 @@
{ stdenv, fetchurl, libjpeg, libtiff, librsvg, libiconv }: { stdenv
, fetchurl
, libjpeg
, libtiff
, librsvg
, libiconv
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "djvulibre-3.5.27"; pname = "djvulibre";
version = "3.5.27";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/djvu/${name}.tar.gz"; url = "mirror://sourceforge/djvu/${pname}-${version}.tar.gz";
sha256 = "0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6"; sha256 = "0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6";
}; };
outputs = [ "bin" "dev" "out" ]; outputs = [ "bin" "dev" "out" ];
buildInputs = [ libjpeg libtiff librsvg libiconv ]; buildInputs = [
libjpeg
libtiff
librsvg
libiconv
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A library and viewer for the DJVU file format for scanned images"; description = "The big set of CLI tools to make/modify/optimize/show/export DJVU files";
homepage = http://djvu.sourceforge.net; homepage = "http://djvu.sourceforge.net";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ Anton-Latukha ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo, hicolor-icon-theme }: { stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gxmessage"; pname = "gxmessage";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool gtk3 texinfo hicolor-icon-theme ]; buildInputs = [ intltool gtk3 texinfo ];
meta = { meta = {
description = "A GTK enabled dropin replacement for xmessage"; description = "A GTK enabled dropin replacement for xmessage";

View file

@ -6,7 +6,6 @@
, gtk3 , gtk3
, libwnck3 , libwnck3
, keybinder3 , keybinder3
, hicolor-icon-theme
, wrapGAppsHook , wrapGAppsHook
, wafHook , wafHook
}: }:
@ -27,7 +26,7 @@ buildPythonApplication rec {
# For setup hook # For setup hook
gobject-introspection wafHook gobject-introspection wafHook
]; ];
buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ]; buildInputs = [ docutils libwnck3 keybinder3 ];
propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
# without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk' # without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk'

View file

@ -7,7 +7,6 @@
, doxygen , doxygen
, fetchFromGitHub , fetchFromGitHub
, ffmpeg , ffmpeg
, hicolor-icon-theme
, libmediainfo , libmediainfo
, libraw , libraw
, libsodium , libsodium
@ -51,7 +50,6 @@ mkDerivation rec {
cryptopp cryptopp
curl curl
ffmpeg ffmpeg
hicolor-icon-theme
libmediainfo libmediainfo
libraw libraw
libsodium libsodium

View file

@ -1,7 +1,7 @@
{ stdenv, pkgconfig, fetchurl, buildPythonApplication { stdenv, pkgconfig, fetchurl, buildPythonApplication
, autoreconfHook, wrapGAppsHook, gobject-introspection , autoreconfHook, wrapGAppsHook, gobject-introspection
, gettext, yelp-tools, itstool, libxmlxx3 , gettext, yelp-tools, itstool, libxmlxx3
, python, pygobject3, gtk3, gnome3, substituteAll, hicolor-icon-theme , python, pygobject3, gtk3, gnome3, substituteAll
, at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg
, xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas , xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas
, speechd, brltty, liblouis, setproctitle, gst_all_1, gst-python , speechd, brltty, liblouis, setproctitle, gst_all_1, gst-python
@ -31,7 +31,6 @@ buildPythonApplication rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook wrapGAppsHook pkgconfig libxmlxx3 autoreconfHook wrapGAppsHook pkgconfig libxmlxx3
gettext yelp-tools itstool gobject-introspection gettext yelp-tools itstool gobject-introspection
hicolor-icon-theme # setup-hook
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoconf, automake, gettext, intltool { stdenv, fetchFromGitHub, autoconf, automake, gettext, intltool
, libtool, pkgconfig, wrapGAppsHook, wrapPython, gobject-introspection , libtool, pkgconfig, wrapGAppsHook, wrapPython, gobject-introspection
, gtk3, python, pygobject3, hicolor-icon-theme, pyxdg , gtk3, python, pygobject3, pyxdg
, withQuartz ? stdenv.isDarwin, ApplicationServices , withQuartz ? stdenv.isDarwin, ApplicationServices
, withRandr ? stdenv.isLinux, libxcb , withRandr ? stdenv.isLinux, libxcb
@ -50,7 +50,6 @@ stdenv.mkDerivation rec {
gobject-introspection gobject-introspection
gtk3 gtk3
python python
hicolor-icon-theme
] ++ stdenv.lib.optional withRandr libxcb ] ++ stdenv.lib.optional withRandr libxcb
++ stdenv.lib.optional withGeoclue geoclue ++ stdenv.lib.optional withGeoclue geoclue
++ stdenv.lib.optional withDrm libdrm ++ stdenv.lib.optional withDrm libdrm

View file

@ -1,5 +1,5 @@
{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub { at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub
, glib, gtk3, harfbuzz, hicolor-icon-theme, libXdmcp, libXtst, libpthreadstubs , glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs
, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2 , libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2
, pkgconfig, stdenv, utillinuxMinimal, vte, wrapGAppsHook, xmlto , pkgconfig, stdenv, utillinuxMinimal, vte, wrapGAppsHook, xmlto
}: }:
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp
utillinuxMinimal glib hicolor-icon-theme docbook_xsl xmlto libselinux utillinuxMinimal glib docbook_xsl xmlto libselinux
libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit
]; ];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee { stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee
, keybinder3, json-glib, zeitgeist, vala, hicolor-icon-theme, gobject-introspection , keybinder3, json-glib, zeitgeist, vala, gobject-introspection
}: }:
let let
@ -20,7 +20,6 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
glib libnotify gtk3 libgee keybinder3 json-glib zeitgeist glib libnotify gtk3 libgee keybinder3 json-glib zeitgeist
hicolor-icon-theme
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -16,7 +16,6 @@
, glib , glib
, wrapGAppsHook , wrapGAppsHook
, libunwind , libunwind
, hicolor-icon-theme
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -38,7 +37,6 @@ stdenv.mkDerivation {
nativeBuildInputs = [ nativeBuildInputs = [
desktop-file-utils desktop-file-utils
dmd dmd
hicolor-icon-theme # for setup-hook
meson meson
ninja ninja
pkgconfig pkgconfig

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre { stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre
, glib, imlib2, gtk2, libXinerama, libXrender, libXcomposite, libXdamage , glib, imlib2, gtk2, libXinerama, libXrender, libXcomposite, libXdamage
, libX11, libXrandr, librsvg, libpthreadstubs, libXdmcp , libX11, libXrandr, librsvg, libpthreadstubs, libXdmcp
, libstartup_notification, hicolor-icon-theme, wrapGAppsHook , libstartup_notification, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender
libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs
libXdmcp libstartup_notification hicolor-icon-theme ]; libXdmcp libstartup_notification ];
postPatch = '' postPatch = ''
for f in ./src/launcher/apps-common.c \ for f in ./src/launcher/apps-common.c \

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, vala, meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas , vala, meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas
, gnome3, pantheon, gobject-introspection, wrapGAppsHook , gnome3, pantheon, gobject-introspection, wrapGAppsHook
, gtk3, json-glib, glib, glib-networking, hicolor-icon-theme , gtk3, json-glib, glib, glib-networking
}: }:
let let
@ -27,7 +27,7 @@ in stdenv.mkDerivation {
wrapGAppsHook wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
gtk3 pantheon.granite json-glib glib glib-networking hicolor-icon-theme gtk3 pantheon.granite json-glib glib glib-networking
libgee gnome3.libsoup gsettings-desktop-schemas libgee gnome3.libsoup gsettings-desktop-schemas
]; ];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, asciidoc-full, gettext { stdenv, fetchFromGitHub, asciidoc-full, gettext
, gobject-introspection, gtk3, hicolor-icon-theme, libappindicator-gtk3, libnotify, librsvg , gobject-introspection, gtk3, libappindicator-gtk3, libnotify, librsvg
, udisks2, wrapGAppsHook , udisks2, wrapGAppsHook
, python3Packages , python3Packages
}: }:
@ -23,7 +23,6 @@ python3Packages.buildPythonApplication rec {
]; ];
buildInputs = [ buildInputs = [
hicolor-icon-theme
librsvg # required for loading svg icons (udiskie uses svg icons) librsvg # required for loading svg icons (udiskie uses svg icons)
gobject-introspection gobject-introspection
libnotify libnotify

View file

@ -10,7 +10,6 @@
, libappindicator , libappindicator
, intltool , intltool
, wmctrl , wmctrl
, hicolor-icon-theme
, xvfb_run , xvfb_run
}: }:
@ -36,7 +35,6 @@ python27Packages.buildPythonApplication rec {
buildInputs = [ buildInputs = [
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
gobject-introspection gobject-introspection
hicolor-icon-theme
keybinder3 keybinder3
libappindicator libappindicator
libnotify libnotify

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, hicolor-icon-theme , docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect
, geoclue2, liboauth, nettle }: , geoclue2, liboauth, nettle }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,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 hicolor-icon-theme libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite
geoclue2 liboauth nettle geoclue2 liboauth nettle
]; ];

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl { stdenv, fetchurl
, autoreconfHook, pkgconfig, wrapGAppsHook , autoreconfHook, pkgconfig, wrapGAppsHook
, glib, intltool, gtk3, gtksourceview, hicolor-icon-theme }: , glib, intltool, gtk3, gtksourceview }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xpad"; pname = "xpad";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ];
buildInputs = [ glib intltool gtk3 gtksourceview hicolor-icon-theme ]; buildInputs = [ glib intltool gtk3 gtksourceview ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A sticky note application for jotting down things to remember"; description = "A sticky note application for jotting down things to remember";

View file

@ -5,7 +5,6 @@
, gettext , gettext
, glib , glib
, gtk3 , gtk3
, hicolor-icon-theme
, libgee , libgee
, libdazzle , libdazzle
, meson , meson
@ -44,7 +43,6 @@ stdenv.mkDerivation rec {
glib glib
glib-networking glib-networking
gtk3 gtk3
hicolor-icon-theme
libdazzle libdazzle
libgee libgee
pantheon.granite pantheon.granite

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3
, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts, fetchpatch , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts, fetchpatch
, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, hicolor-icon-theme , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
}: }:
@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
curl glib json-glib libnotify libsecret sqlite gumbo gtk3 curl glib json-glib libnotify libsecret sqlite gumbo gtk3
libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas
gnome-online-accounts gnome-online-accounts
hicolor-icon-theme # for setup hook
] ++ (with gst_all_1; [ ] ++ (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good gstreamer gst-plugins-base gst-plugins-good
]); ]);

View file

@ -10,7 +10,6 @@
, rustPlatform , rustPlatform
, pkgconfig , pkgconfig
, gtksourceview , gtksourceview
, hicolor-icon-theme
, glib , glib
, libhandy , libhandy
, gtk3 , gtk3
@ -61,7 +60,6 @@ rustPlatform.buildRustPackage rec {
gst_all_1.gstreamer gst_all_1.gstreamer
gtk3 gtk3
gtksourceview gtksourceview
hicolor-icon-theme
libhandy libhandy
openssl openssl
sqlite sqlite

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, lua, perl, python3 { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, lua, perl, python3
, pciutils, dbus-glib, libcanberra-gtk2, libproxy , pciutils, dbus-glib, libcanberra-gtk2, libproxy
, libsexy, enchant2, libnotify, openssl, isocodes , libsexy, enchant2, libnotify, openssl, isocodes
, desktop-file-utils, hicolor-icon-theme , desktop-file-utils
, meson, ninja , meson, ninja
}: }:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk2 lua perl python3 pciutils dbus-glib libcanberra-gtk2 libproxy gtk2 lua perl python3 pciutils dbus-glib libcanberra-gtk2 libproxy
libsexy libnotify openssl desktop-file-utils hicolor-icon-theme libsexy libnotify openssl desktop-file-utils
isocodes isocodes
]; ];

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls, { stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls,
webkitgtk, libesmtp, openssl, libnotify, gtkspell3, gpgme, webkitgtk, libesmtp, openssl, libnotify, gtkspell3, gpgme,
libcanberra-gtk3, libsecret, gtksourceview, gobject-introspection, libcanberra-gtk3, libsecret, gtksourceview, gobject-introspection,
hicolor-icon-theme, wrapGAppsHook wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
pkgconfig pkgconfig
intltool intltool
gobject-introspection gobject-introspection
hicolor-icon-theme
wrapGAppsHook wrapGAppsHook
]; ];

View file

@ -1,8 +1,8 @@
{ config, fetchurl, stdenv, wrapGAppsHook, autoreconfHook { config, fetchurl, stdenv, wrapGAppsHook, autoreconfHook
, curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor-icon-theme , curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme
, libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager , libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager
, openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2 , openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2
, glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical , glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical
# Build options # Build options
# TODO: A flag to build the manual. # TODO: A flag to build the manual.
# TODO: Plugins that complain about their missing dependencies, even when # TODO: Plugins that complain about their missing dependencies, even when
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ];
buildInputs = buildInputs =
[ curl dbus dbus-glib gtk2 gnutls gsettings-desktop-schemas hicolor-icon-theme [ curl dbus dbus-glib gtk2 gnutls gsettings-desktop-schemas
libetpan perl glib-networking libSM libytnef libetpan perl glib-networking libSM libytnef
] ]
++ optional enableSpellcheck enchant ++ optional enableSpellcheck enchant

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook { stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook
, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1 , glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1
, libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg , libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg
, gobject-introspection, glib-networking, hicolor-icon-theme , gobject-introspection, glib-networking
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas
libpeas gsettings-desktop-schemas json-glib dconf gobject-introspection libpeas gsettings-desktop-schemas json-glib dconf gobject-introspection
librsvg glib-networking libnotify hicolor-icon-theme librsvg glib-networking libnotify
] ++ (with gst_all_1; [ ] ++ (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
]); ]);

View file

@ -7,7 +7,6 @@
, curl , curl
, glib , glib
, gtk3 , gtk3
, hicolor-icon-theme
, libb64 , libb64
, libevent , libevent
, libgee , libgee
@ -41,7 +40,6 @@ stdenv.mkDerivation rec {
curl curl
glib glib
gtk3 gtk3
hicolor-icon-theme
libb64 libb64
libevent libevent
libgee libgee

View file

@ -1,6 +1,5 @@
{ stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig { stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig
, intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib , intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib }:
, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -22,7 +21,7 @@ stdenv.mkDerivation rec {
appstream-glib appstream-glib
]; ];
buildInputs = [ gtk3 json-glib curl glib hicolor-icon-theme ]; buildInputs = [ gtk3 json-glib curl glib ];
doCheck = false; # fails with style validation error doCheck = false; # fails with style validation error

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook { stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook
, openssl, curl, libevent, inotify-tools, systemd, zlib, hicolor-icon-theme , openssl, curl, libevent, inotify-tools, systemd, zlib
, enableGTK3 ? false, gtk3 , enableGTK3 ? false, gtk3
, enableSystemd ? stdenv.isLinux , enableSystemd ? stdenv.isLinux
, enableDaemon ? true , enableDaemon ? true
@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ intltool file openssl curl libevent zlib ] buildInputs = [ intltool file openssl curl libevent zlib ]
++ optionals enableGTK3 [ gtk3 ] ++ optionals enableGTK3 [ gtk3 ]
++ optionals enableSystemd [ systemd ] ++ optionals enableSystemd [ systemd ]
++ optionals stdenv.isLinux [ inotify-tools ] ++ optionals stdenv.isLinux [ inotify-tools ];
++ optionals enableGTK3 [ hicolor-icon-theme ];
postPatch = '' postPatch = ''
substituteInPlace ./configure \ substituteInPlace ./configure \

View file

@ -9,7 +9,6 @@
, glib , glib
, gtk3 , gtk3
, gtksourceview , gtksourceview
, hicolor-icon-theme
, json-glib , json-glib
, libsoup , libsoup
, libgee , libgee
@ -39,7 +38,6 @@ stdenv.mkDerivation rec {
glib glib
gtk3 gtk3
gtksourceview gtksourceview
hicolor-icon-theme
json-glib json-glib
libgee libgee
libsoup libsoup

View file

@ -6,7 +6,7 @@
, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core , libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core
, openssl, gsettings-desktop-schemas, json-glib , openssl, gsettings-desktop-schemas, json-glib
# The themes here are soft dependencies; only icons are missing without them. # The themes here are soft dependencies; only icons are missing without them.
, hicolor-icon-theme, gnome3 , gnome3
}: }:
with stdenv.lib; with stdenv.lib;
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
pcre libdbusmenu-gtk3 libappindicator-gtk3 pcre libdbusmenu-gtk3 libappindicator-gtk3
libvncserver libpthreadstubs libXdmcp libxkbcommon libvncserver libpthreadstubs libXdmcp libxkbcommon
libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core
openssl hicolor-icon-theme gnome3.adwaita-icon-theme json-glib openssl gnome3.adwaita-icon-theme json-glib
]; ];
cmakeFlags = [ cmakeFlags = [

View file

@ -1,7 +1,6 @@
{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3 { stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3
, json-glib, libsoup, webkitgtk, geocode-glib , json-glib, libsoup, webkitgtk, geocode-glib
, libappindicator, desktop-file-utils, appstream, wrapGAppsHook , libappindicator, desktop-file-utils, appstream, wrapGAppsHook }:
, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "meteo"; pname = "meteo";
@ -28,7 +27,6 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
geocode-glib geocode-glib
gtk3 gtk3
hicolor-icon-theme
json-glib json-glib
libappindicator libappindicator
libsoup libsoup

View file

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales
webkitgtk dconf hicolor-icon-theme libofx aqbanking gwenhywfar libdbi webkitgtk dconf libofx aqbanking gwenhywfar libdbi
libdbiDrivers guile libdbiDrivers guile
perlWrapper perl perlWrapper perl
] ++ (with perlPackages; [ FinanceQuote DateManip ]); ] ++ (with perlPackages; [ FinanceQuote DateManip ]);

View file

@ -1,5 +1,5 @@
{ fetchurl, stdenv, gtk, pkgconfig, libgsf, libofx, intltool, wrapGAppsHook { fetchurl, stdenv, gtk, pkgconfig, libgsf, libofx, intltool, wrapGAppsHook
, hicolor-icon-theme, libsoup, gnome3 }: , libsoup, gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "grisbi"; pname = "grisbi";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ gtk libgsf libofx intltool hicolor-icon-theme libsoup buildInputs = [ gtk libgsf libofx intltool libsoup
gnome3.adwaita-icon-theme ]; gnome3.adwaita-icon-theme ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -1,5 +1,5 @@
{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook { fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook
, hicolor-icon-theme, libsoup, gnome3 }: , libsoup, gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "homebank-5.2.8"; name = "homebank-5.2.8";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup buildInputs = [ gtk libofx intltool libsoup
gnome3.adwaita-icon-theme ]; gnome3.adwaita-icon-theme ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -1,6 +1,6 @@
{ lib, python3Packages, gtk3, cairo { lib, python3Packages, gtk3, cairo
, aspellDicts, buildEnv , aspellDicts, buildEnv
, gnome3, hicolor-icon-theme, librsvg , gnome3, librsvg
, xvfb_run, dbus, libnotify , xvfb_run, dbus, libnotify
}: }:
@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec {
checkInputs = [ xvfb_run dbus.daemon ] ++ (with python3Packages; [ paperwork-backend ]); checkInputs = [ xvfb_run dbus.daemon ] ++ (with python3Packages; [ paperwork-backend ]);
buildInputs = [ buildInputs = [
gnome3.adwaita-icon-theme hicolor-icon-theme libnotify librsvg gnome3.adwaita-icon-theme libnotify librsvg
]; ];
# A few parts of chkdeps need to have a display and a dbus session, so we not # A few parts of chkdeps need to have a display and a dbus session, so we not

View file

@ -3,7 +3,6 @@
, glib , glib
, gtk3 , gtk3
, vala , vala
, hicolor-icon-theme
, json-glib , json-glib
, libgee , libgee
, meson , meson
@ -38,7 +37,6 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib glib
gtk3 gtk3
hicolor-icon-theme
json-glib json-glib
libgee libgee
pantheon.granite pantheon.granite

View file

@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtwebengine, hicolor-icon-theme }: { lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtwebengine }:
let let
description = "A note-taking application that knows programmers and Markdown better"; description = "A note-taking application that knows programmers and Markdown better";
@ -15,7 +15,7 @@ in mkDerivation rec {
}; };
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtwebengine hicolor-icon-theme ]; buildInputs = [ qtbase qtwebengine ];
meta = with lib; { meta = with lib; {
inherit description; inherit description;

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, file, which, intltool, gobject-introspection, { stdenv, fetchurl, file, which, intltool, gobject-introspection,
findutils, xdg_utils, gnome3, gtk3, pythonPackages, hicolor-icon-theme, findutils, xdg_utils, gnome3, gtk3, pythonPackages,
wrapGAppsHook wrapGAppsHook
}: }:
@ -29,7 +29,6 @@ pythonPackages.buildPythonApplication rec {
pythonPackages.pyxdg pythonPackages.pyxdg
pythonPackages.ptyprocess pythonPackages.ptyprocess
pythonPackages.pycairo pythonPackages.pycairo
hicolor-icon-theme
gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
]; ];

View file

@ -141,8 +141,9 @@ stdenv.mkDerivation {
cp -a contrib $out/share/git/ cp -a contrib $out/share/git/
mkdir -p $out/share/emacs/site-lisp mkdir -p $out/share/emacs/site-lisp
ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/ ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/
mkdir -p $out/share/bash-completion/completions
ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git
mkdir -p $out/etc/bash_completion.d mkdir -p $out/etc/bash_completion.d
ln -s $out/share/git/contrib/completion/git-completion.bash $out/etc/bash_completion.d/
ln -s $out/share/git/contrib/completion/git-prompt.sh $out/etc/bash_completion.d/ ln -s $out/share/git/contrib/completion/git-prompt.sh $out/etc/bash_completion.d/
# grep is a runtime dependency, need to patch so that it's found # grep is a runtime dependency, need to patch so that it's found

View file

@ -2,7 +2,7 @@
, libXfixes, atk, gtk3, libXrender, pango, gnome3, cairo, freetype, fontconfig , libXfixes, atk, gtk3, libXrender, pango, gnome3, cairo, freetype, fontconfig
, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
, nss, nspr, cups, fetchurl, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , nss, nspr, cups, fetchurl, expat, gdk-pixbuf, libXdamage, libXrandr, dbus
, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme, at-spi2-atk, libuuid , dpkg, makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, libuuid
, e2fsprogs, krb5 , e2fsprogs, krb5
}: }:
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
buildInputs = [ dpkg gtk3 gnome3.adwaita-icon-theme hicolor-icon-theme ]; buildInputs = [ dpkg gtk3 gnome3.adwaita-icon-theme ];
unpackCmd = '' unpackCmd = ''
mkdir out mkdir out

View file

@ -6,7 +6,6 @@
, glib , glib
, gnome3 , gnome3
, wrapGAppsHook , wrapGAppsHook
, hicolor-icon-theme
, libXtst , libXtst
, which , which
}: }:
@ -22,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook ];
buildInputs = [ jre gnome3.adwaita-icon-theme hicolor-icon-theme gtk3 ]; buildInputs = [ jre gnome3.adwaita-icon-theme gtk3 ];
preFixup = with stdenv.lib; '' preFixup = with stdenv.lib; ''
gappsWrapperArgs+=( \ gappsWrapperArgs+=( \

View file

@ -1,6 +1,6 @@
{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper { config, stdenv, fetchurl, fetchFromGitHub, makeWrapper
, docutils, perl, pkgconfig, python3, which, ffmpeg_4 , addOpenGLRunpath, docutils, perl, pkgconfig, python3, which
, freefont_ttf, freetype, libass, libpthreadstubs, mujs , ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs
, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin , nv-codec-headers, lua, libuchardet, libiconv ? null, darwin
, waylandSupport ? stdenv.isLinux , waylandSupport ? stdenv.isLinux
@ -135,8 +135,7 @@ in stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
docutils makeWrapper perl addOpenGLRunpath docutils makeWrapper perl pkgconfig python3 which
pkgconfig python3 which
]; ];
buildInputs = [ buildInputs = [
@ -214,11 +213,17 @@ in stdenv.mkDerivation rec {
${wrapperFlags} ${wrapperFlags}
''; '';
# Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
# See the explanation in addOpenGLRunpath.
postFixup = optionalString stdenv.isLinux ''
addOpenGLRunpath $out/bin/.mpv-wrapped
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A media player that supports many video formats (MPlayer and mplayer2 fork)"; description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
homepage = https://mpv.io; homepage = https://mpv.io;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz globin ]; maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz globin ivan ];
platforms = platforms.darwin ++ platforms.linux; platforms = platforms.darwin ++ platforms.linux;
longDescription = '' longDescription = ''

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, which, qmake, mkDerivation, { stdenv, fetchFromGitHub, pkgconfig, which, qmake, mkDerivation,
qtbase, qtmultimedia, frei0r, opencolorio, hicolor-icon-theme, ffmpeg-full, qtbase, qtmultimedia, frei0r, opencolorio, ffmpeg-full,
CoreFoundation }: CoreFoundation }:
mkDerivation rec { mkDerivation rec {
@ -13,9 +13,9 @@ mkDerivation rec {
sha256 = "15q4qwf5rc3adssywl72jrhkpqk55ihpd5h5wf07baw0s47vv5kq"; sha256 = "15q4qwf5rc3adssywl72jrhkpqk55ihpd5h5wf07baw0s47vv5kq";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
which which
qmake qmake
]; ];
@ -26,7 +26,6 @@ mkDerivation rec {
qtbase qtbase
qtmultimedia qtmultimedia
qtmultimedia.dev qtmultimedia.dev
hicolor-icon-theme
] ++ stdenv.lib.optional stdenv.isDarwin CoreFoundation; ] ++ stdenv.lib.optional stdenv.isDarwin CoreFoundation;
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -10,7 +10,6 @@
, libXtst , libXtst
, wrapGAppsHook , wrapGAppsHook
, gnome3 , gnome3
, hicolor-icon-theme
}: }:
buildPythonApplication rec { buildPythonApplication rec {
pname = "screenkey"; pname = "screenkey";
@ -40,7 +39,6 @@ buildPythonApplication rec {
buildInputs = [ buildInputs = [
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
hicolor-icon-theme
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -24,7 +24,8 @@ bintoolsWrapper_addLDVars () {
# Python and Haskell packages often only have directories like $out/lib/ghc-8.4.3/ or # Python and Haskell packages often only have directories like $out/lib/ghc-8.4.3/ or
# $out/lib/python3.6/, so having them in LDFLAGS just makes the linker search unnecessary # $out/lib/python3.6/, so having them in LDFLAGS just makes the linker search unnecessary
# directories and bloats the size of the environment variable space. # directories and bloats the size of the environment variable space.
if [[ -n "$(echo $1/lib/lib*)" ]]; then local -a glob=( $1/lib/lib* )
if [ "${#glob[*]}" -gt 0 ]; then
export NIX_${role_pre}LDFLAGS+=" -L$1/lib" export NIX_${role_pre}LDFLAGS+=" -L$1/lib"
fi fi
fi fi
@ -61,9 +62,8 @@ do
if if
PATH=$_PATH type -p "@targetPrefix@${cmd}" > /dev/null PATH=$_PATH type -p "@targetPrefix@${cmd}" > /dev/null
then then
upper_case="$(echo "$cmd" | tr "[:lower:]" "[:upper:]")" export "${role_pre}${cmd^^}=@targetPrefix@${cmd}";
export "${role_pre}${upper_case}=@targetPrefix@${cmd}"; export "${cmd^^}${role_post}=@targetPrefix@${cmd}";
export "${upper_case}${role_post}=@targetPrefix@${cmd}";
fi fi
done done

View file

@ -26,6 +26,19 @@ sub isInPathsToLink {
return 0; return 0;
} }
# Returns whether a path in one of the linked packages may contain
# files in one of the elements of pathsToLink.
sub hasPathsToLink {
my $path = shift;
foreach my $elem (@pathsToLink) {
return 1 if
$path eq "" ||
(substr($elem, 0, length($path)) eq $path
&& (($path eq $elem) || (substr($elem, length($path), 1) eq "/")));
}
return 0;
}
# Similar to `lib.isStorePath` # Similar to `lib.isStorePath`
sub isStorePath { sub isStorePath {
my $path = shift; my $path = shift;
@ -103,7 +116,8 @@ sub findFiles {
$relName =~ /info\/dir/ || $relName =~ /info\/dir/ ||
( $relName =~ /^\/share\/mime\// && !( $relName =~ /^\/share\/mime\/packages/ ) ) || ( $relName =~ /^\/share\/mime\// && !( $relName =~ /^\/share\/mime\/packages/ ) ) ||
$baseName eq "perllocal.pod" || $baseName eq "perllocal.pod" ||
$baseName eq "log"; $baseName eq "log" ||
! (hasPathsToLink($relName) || isInPathsToLink($relName));
my ($oldTarget, $oldPriority) = @{$symlinks{$relName} // [undef, undef]}; my ($oldTarget, $oldPriority) = @{$symlinks{$relName} // [undef, undef]};

View file

@ -33,6 +33,7 @@ fi
# GCC prints annoying warnings when they are not needed. # GCC prints annoying warnings when they are not needed.
dontLink=0 dontLink=0
nonFlagArgs=0 nonFlagArgs=0
cc1=0
# shellcheck disable=SC2193 # shellcheck disable=SC2193
[[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0 [[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0
cppInclude=1 cppInclude=1
@ -68,6 +69,8 @@ while (( "$n" < "$nParams" )); do
elif [[ "$p" != -?* ]]; then elif [[ "$p" != -?* ]]; then
# A dash alone signifies standard input; it is not a flag # A dash alone signifies standard input; it is not a flag
nonFlagArgs=1 nonFlagArgs=1
elif [ "$p" = -cc1 ]; then
cc1=1
fi fi
n+=1 n+=1
done done
@ -167,6 +170,14 @@ if [ "$*" = -v ]; then
extraBefore=() extraBefore=()
fi fi
# clang's -cc1 mode is not compatible with most options
# that we would pass. Rather than trying to pass only
# options that would work, let's just remove all of them.
if [ "$cc1" = 1 ]; then
extraAfter=()
extraBefore=()
fi
# Optionally print debug info. # Optionally print debug info.
if (( "${NIX_DEBUG:-0}" >= 1 )); then if (( "${NIX_DEBUG:-0}" >= 1 )); then
# Old bash workaround, see ld-wrapper for explanation. # Old bash workaround, see ld-wrapper for explanation.

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }: { stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${package-name}-${version}"; name = "${package-name}-${version}";
@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
postFixup = "gtk-update-icon-cache $out/share/icons/Arc"; postFixup = "gtk-update-icon-cache $out/share/icons/Arc";
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -11,7 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "00sk6sv0kkfb3q0jqwcllzawi30rw8nfkkfn5l1qwqha48izw3r4"; sha256 = "00sk6sv0kkfb3q0jqwcllzawi30rw8nfkkfn5l1qwqha48izw3r4";
}; };
nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 hicolor-icon-theme ]; nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
postPatch = '' postPatch = ''
substituteInPlace svgtopng/Makefile --replace "-O0" "-O" substituteInPlace svgtopng/Makefile --replace "-O0" "-O"

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon }: { stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${package-name}-${version}"; name = "${package-name}-${version}";
@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja python3 gtk3 pantheon.elementary-icon-theme ]; nativeBuildInputs = [ meson ninja python3 gtk3 pantheon.elementary-icon-theme ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
postPatch = '' postPatch = ''
patchShebangs meson/post_install.py patchShebangs meson/post_install.py
''; '';

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }: { stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "faba-mono-icons"; pname = "faba-mono-icons";
@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
postFixup = '' postFixup = ''
for theme in $out/share/icons/*; do for theme in $out/share/icons/*; do
gtk-update-icon-cache $theme gtk-update-icon-cache $theme

View file

@ -1,21 +1,13 @@
# shellcheck shell=bash
# Populate XDG_ICON_DIRS # Populate XDG_ICON_DIRS
hicolorIconThemeHook() { hicolorIconThemeHook() {
# where to find icon themes # where to find icon themes
if [ -d "$1/share/icons" ]; then if [ -d "$1/share/icons" ]; then
addToSearchPath XDG_ICON_DIRS $1/share addToSearchPath XDG_ICON_DIRS "$1/share"
fi fi
} }
# I think this is meant to be a runtime dep # I think this is meant to be a runtime dep
addEnvHooks "$hostOffset" hicolorIconThemeHook addEnvHooks "${hostOffset:?}" hicolorIconThemeHook
# Remove icon cache
hicolorPreFixupPhase() {
rm -f $out/share/icons/hicolor/icon-theme.cache
rm -f $out/share/icons/HighContrast/icon-theme.cache
}
preFixupPhases="$preFixupPhases hicolorPreFixupPhase"

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gtk3 }: { stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "iconpack-obsidian"; pname = "iconpack-obsidian";
@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gtk3 ]; nativeBuildInputs = [ gtk3 ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
installPhase = '' installPhase = ''
mkdir -p $out/share/icons mkdir -p $out/share/icons
mv Obsidian* $out/share/icons mv Obsidian* $out/share/icons

View file

@ -21,10 +21,12 @@ stdenv.mkDerivation {
kdeFrameworks.kwindowsystem kdeFrameworks.kwindowsystem
]; ];
buildInputs = [ propagatedBuildInputs = [
hicolor-icon-theme hicolor-icon-theme
]; ];
dontDropIconThemeCache = true;
postFixup = '' postFixup = ''
for theme in $out/share/icons/*; do for theme in $out/share/icons/*; do
gtk-update-icon-cache $theme gtk-update-icon-cache $theme

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme }: { stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "moka-icon-theme"; pname = "moka-icon-theme";
@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja gtk3 python3 faba-icon-theme ]; nativeBuildInputs = [ meson ninja gtk3 python3 faba-icon-theme ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
postPatch = '' postPatch = ''
patchShebangs meson/post_install.py patchShebangs meson/post_install.py
''; '';

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: { stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "numix-icon-theme-circle"; pname = "numix-icon-theme-circle";
@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gtk3 numix-icon-theme ]; nativeBuildInputs = [ gtk3 numix-icon-theme ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
installPhase = '' installPhase = ''
install -dm 755 $out/share/icons install -dm 755 $out/share/icons
cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/ cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: { stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "numix-icon-theme-square"; pname = "numix-icon-theme-square";
@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gtk3 numix-icon-theme ]; nativeBuildInputs = [ gtk3 numix-icon-theme ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
installPhase = '' installPhase = ''
mkdir -p $out/share/icons mkdir -p $out/share/icons
cp -a Numix-Square{,-Light} $out/share/icons/ cp -a Numix-Square{,-Light} $out/share/icons/

View file

@ -11,7 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "0pn3x0mmsph777lwhg890ck366p31bjl3755h4pv161ym08d4z9w"; sha256 = "0pn3x0mmsph777lwhg890ck366p31bjl3755h4pv161ym08d4z9w";
}; };
nativeBuildInputs = [ gtk3 hicolor-icon-theme ]; nativeBuildInputs = [ gtk3 ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
installPhase = '' installPhase = ''
mkdir -p $out/share/icons mkdir -p $out/share/icons

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3 }: { stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "paper-icon-theme"; pname = "paper-icon-theme";
@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja gtk3 python3 ]; nativeBuildInputs = [ meson ninja gtk3 python3 ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
postPatch = '' postPatch = ''
patchShebangs meson/post_install.py patchShebangs meson/post_install.py
''; '';

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gtk3 }: { stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "papirus-icon-theme"; pname = "papirus-icon-theme";
@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gtk3 ]; nativeBuildInputs = [ gtk3 ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
installPhase = '' installPhase = ''
mkdir -p $out/share/icons mkdir -p $out/share/icons
mv {,e}Papirus* $out/share/icons mv {,e}Papirus* $out/share/icons

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg { stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg
, gtk/*any version*/ , gtk/*any version*/, hicolor-icon-theme
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool iconnamingutils imagemagick librsvg ]; buildInputs = [ intltool iconnamingutils imagemagick librsvg ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
configureFlags = [ "--enable-png-creation" ]; configureFlags = [ "--enable-png-creation" ];
postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" ''; postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" '';

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchzip, xorg }: { stdenv, lib, fetchzip, xorg, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vanilla-dmz"; pname = "vanilla-dmz";
@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "1l0c0svk7dy0d7icg7j2181wdn3fvks5gmyqnvjk749ppy5ks8mj"; sha256 = "1l0c0svk7dy0d7icg7j2181wdn3fvks5gmyqnvjk749ppy5ks8mj";
}; };
buildInputs = [ xorg.xcursorgen ]; buildInputs = [ xorg.xcursorgen ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
buildPhase = '' buildPhase = ''
cd DMZ-White/pngs; ./make.sh; cd - cd DMZ-White/pngs; ./make.sh; cd -
cd DMZ-Black/pngs; ./make.sh; cd - cd DMZ-Black/pngs; ./make.sh; cd -

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gtk3 }: { stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zafiro-icons"; pname = "zafiro-icons";
@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gtk3 ]; nativeBuildInputs = [ gtk3 ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
installPhase = '' installPhase = ''
mkdir -p $out/share/icons/Zafiro-icons mkdir -p $out/share/icons/Zafiro-icons
cp -a * $out/share/icons/Zafiro-icons cp -a * $out/share/icons/Zafiro-icons

View file

@ -1,7 +1,3 @@
cacertHook() { export NIX_SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
export NIX_SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt # left for compatibility
# left for compatibility export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
}
addEnvHooks "$targetOffset" cacertHook

View file

@ -1,21 +1,36 @@
{stdenv, fetchurl, pkgconfig, gettext, perlPackages, intltool { stdenv
, libxml2, glib}: , fetchurl
, pkgconfig
, gettext
, perlPackages
, itstool
, libxml2
, glib
}:
let version = "1.12"; in stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "shared-mime-info"; pname = "shared-mime-info";
inherit version; version = "1.13.1";
src = fetchurl { src = fetchurl {
url = "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/shared-mime-info-1.12.tar.xz"; url = "https://gitlab.freedesktop.org/xdg/${pname}/uploads/5349e18c86eb96eee258a5c1f19122d0/${pname}-${version}.tar.xz";
sha256 = "0gj0pp36qpsr9w6v4nywnjpcisadwkndapqsjn0ny3gd0zzg1chq"; sha256 = "1bic8z5nz08qxv1x6zlxnx2j4cmlzm12kygrn3rrh1djqxdhma3f";
}; };
nativeBuildInputs = [ pkgconfig gettext intltool ] ++ (with perlPackages; [ perl XMLParser ]); nativeBuildInputs = [
buildInputs = [ libxml2 glib ]; pkgconfig
gettext
itstool
] ++ (with perlPackages; [
perl XMLParser
]);
buildInputs = [
libxml2
glib
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
inherit version;
description = "A database of common MIME types"; description = "A database of common MIME types";
homepage = http://freedesktop.org/wiki/Software/shared-mime-info; homepage = http://freedesktop.org/wiki/Software/shared-mime-info;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;

View file

@ -1,7 +1,7 @@
{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dbus, dde-daemon, { stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dbus, dde-daemon,
dde-qt-dbus-factory, deepin, deepin-desktop-schemas, dde-qt-dbus-factory, deepin, deepin-desktop-schemas,
deepin-gettext-tools, deepin-icon-theme, deepin-wallpapers, dtkcore, deepin-gettext-tools, deepin-icon-theme, deepin-wallpapers, dtkcore,
dtkwidget, gnugrep, gsettings-qt, hicolor-icon-theme, lightdm_qt, dtkwidget, gnugrep, gsettings-qt, lightdm_qt,
onboard, qtsvg, qttools, qtx11extras, setxkbmap, utillinux, which, onboard, qtsvg, qttools, qtx11extras, setxkbmap, utillinux, which,
xkeyboard_config, xorg, xrandr, wrapGAppsHook }: xkeyboard_config, xorg, xrandr, wrapGAppsHook }:
@ -36,7 +36,6 @@ mkDerivation rec {
dtkwidget dtkwidget
gnugrep gnugrep
gsettings-qt gsettings-qt
hicolor-icon-theme
lightdm_qt lightdm_qt
onboard onboard
qtsvg qtsvg

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gtk3, xcursorgen, papirus-icon-theme, deepin }: { stdenv, fetchFromGitHub, gtk3, xcursorgen, papirus-icon-theme, deepin, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "deepin-icon-theme"; pname = "deepin-icon-theme";
@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
buildInputs = [ papirus-icon-theme ]; buildInputs = [ papirus-icon-theme ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
postPatch = '' postPatch = ''
patchShebangs tools/hicolor.links patchShebangs tools/hicolor.links
patchShebangs tools/display_unused_links.sh patchShebangs tools/display_unused_links.sh

View file

@ -6,7 +6,6 @@
, ninja , ninja
, python3 , python3
, gnome3 , gnome3
, hicolor-icon-theme
, desktop-file-utils , desktop-file-utils
, appstream-glib , appstream-glib
, gettext , gettext
@ -32,7 +31,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
desktop-file-utils desktop-file-utils
gettext gettext
hicolor-icon-theme # for setup-hook
itstool itstool
meson meson
ninja ninja

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gettext, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk-pixbuf, gst_all_1, gnome3 { stdenv, fetchurl, pkgconfig, gettext, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk-pixbuf, gst_all_1, gnome3
, meson, ninja, python3, hicolor-icon-theme, desktop-file-utils }: , meson, ninja, python3, desktop-file-utils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-sound-recorder"; pname = "gnome-sound-recorder";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig gettext meson ninja gobject-introspection pkgconfig gettext meson ninja gobject-introspection
wrapGAppsHook python3 hicolor-icon-theme desktop-file-utils wrapGAppsHook python3 desktop-file-utils
]; ];
buildInputs = [ gjs glib gtk3 gdk-pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]); buildInputs = [ gjs glib gtk3 gdk-pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]);

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3 { stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3
, libxml2, gettext, docbook_xsl, hicolor-icon-theme, wrapGAppsHook, gobject-introspection }: , libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }:
let let
pname = "dconf-editor"; pname = "dconf-editor";
@ -15,7 +15,6 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja vala libxslt pkgconfig wrapGAppsHook meson ninja vala libxslt pkgconfig wrapGAppsHook
gettext docbook_xsl libxml2 gobject-introspection python3 gettext docbook_xsl libxml2 gobject-introspection python3
hicolor-icon-theme # for setup-hook
]; ];
buildInputs = [ glib gtk3 gnome3.dconf ]; buildInputs = [ glib gtk3 gnome3.dconf ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, desktop-file-utils, gnome3, glib, gtk3, libexif, libtiff, colord, colord-gtk, libcanberra-gtk3, lcms2, vte, exiv2, hicolor-icon-theme }: { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, desktop-file-utils, gnome3, glib, gtk3, libexif, libtiff, colord, colord-gtk, libcanberra-gtk3, lcms2, vte, exiv2 }:
let let
pname = "gnome-color-manager"; pname = "gnome-color-manager";
@ -13,8 +13,6 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig gettext itstool desktop-file-utils meson ninja pkgconfig gettext itstool desktop-file-utils
# setup-hook
hicolor-icon-theme
]; ];
buildInputs = [ glib gtk3 libexif libtiff colord colord-gtk libcanberra-gtk3 lcms2 vte exiv2 ]; buildInputs = [ glib gtk3 libexif libtiff colord colord-gtk libcanberra-gtk3 lcms2 vte exiv2 ];

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd , glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd
, gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts, hicolor-icon-theme , gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts
, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }: , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }:
let let
@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42 docbook_xml_dtd_43 meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42 docbook_xml_dtd_43
valgrind-light docbook_xsl gtk-doc desktop-file-utils gobject-introspection valgrind-light docbook_xsl gtk-doc desktop-file-utils gobject-introspection
hicolor-icon-theme # for setup-hook
]; ];
buildInputs = [ buildInputs = [

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus { stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus
, gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala , gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala
, desktop-file-utils, itstool, wrapGAppsHook, hicolor-icon-theme, glib, pcre2 }: , desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-terminal"; pname = "gnome-terminal";
@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig intltool itstool which libxml2 pkgconfig intltool itstool which libxml2
vala desktop-file-utils wrapGAppsHook pcre2 vala desktop-file-utils wrapGAppsHook pcre2
hicolor-icon-theme # for setup-hook
]; ];
# Silly ./configure, it looks for dbus file from gnome-shell in the # Silly ./configure, it looks for dbus file from gnome-shell in the

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, gsound, gettext, itstool, libxml2, libgnome-games-support , librsvg, gsound, gettext, itstool, libxml2, libgnome-games-support
, libgee, meson, ninja, python3, desktop-file-utils , hicolor-icon-theme, adwaita-icon-theme }: , libgee, meson, ninja, python3, desktop-file-utils, adwaita-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-robots"; pname = "gnome-robots";
@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig meson ninja python3 pkgconfig meson ninja python3
libxml2 wrapGAppsHook gettext itstool desktop-file-utils libxml2 wrapGAppsHook gettext itstool desktop-file-utils
hicolor-icon-theme # For setup-hook
]; ];
buildInputs = [ buildInputs = [
gtk3 librsvg gsound libgnome-games-support libgee adwaita-icon-theme gtk3 librsvg gsound libgnome-games-support libgee adwaita-icon-theme

View file

@ -24,7 +24,6 @@
, meson , meson
, ninja , ninja
, python3 , python3
, hicolor-icon-theme
, libdazzle , libdazzle
}: }:
@ -66,7 +65,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
gobject-introspection gobject-introspection
hicolor-icon-theme
gettext gettext
meson meson
ninja ninja

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, packagekit, polkit { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, packagekit, polkit
, gtk3, systemd, wrapGAppsHook, desktop-file-utils, hicolor-icon-theme }: , gtk3, systemd, wrapGAppsHook, desktop-file-utils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-packagekit"; pname = "gnome-packagekit";
@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils
hicolor-icon-theme # for setup-hook
]; ];
buildInputs = [ gtk3 packagekit systemd polkit ]; buildInputs = [ gtk3 packagekit systemd polkit ];

View file

@ -1,5 +1,5 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, qttools, { lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, qttools,
qtx11extras, xorg, lxqt-build-tools, openbox, hicolor-icon-theme }: qtx11extras, xorg, lxqt-build-tools, openbox }:
mkDerivation rec { mkDerivation rec {
pname = "obconf-qt"; pname = "obconf-qt";
@ -27,7 +27,6 @@ mkDerivation rec {
xorg.libXdmcp xorg.libXdmcp
xorg.libSM xorg.libSM
openbox openbox
hicolor-icon-theme
]; ];
meta = with lib; { meta = with lib; {

View file

@ -11,7 +11,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook gtk3 ]; nativeBuildInputs = [ autoreconfHook gtk3 ];
buildInputs = [ mate.mate-icon-theme hicolor-icon-theme ]; buildInputs = [ mate.mate-icon-theme ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
postInstall = '' postInstall = ''
for theme in "$out"/share/icons/*; do for theme in "$out"/share/icons/*; do

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor-icon-theme, gtk3 }: { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-icon-theme"; pname = "mate-icon-theme";
@ -11,7 +11,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];
buildInputs = [ librsvg hicolor-icon-theme ]; buildInputs = [ librsvg ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
postInstall = '' postInstall = ''
for theme in "$out"/share/icons/*; do for theme in "$out"/share/icons/*; do

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier, { stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier,
libcanberra-gtk3, libnotify, nss, polkit, gnome3, gtk3, mate, libcanberra-gtk3, libnotify, nss, polkit, gnome3, gtk3, mate,
pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio,
wrapGAppsHook }: wrapGAppsHook, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-settings-daemon"; pname = "mate-settings-daemon";
@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "0idw02z0iig0pfxvlhc4dq4sr7kl1w50xscvg0jzzswnxid2l4ip"; sha256 = "0idw02z0iig0pfxvlhc4dq4sr7kl1w50xscvg0jzzswnxid2l4ip";
}; };
patches = [
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/mate-desktop/mate-settings-daemon/pull/296.patch";
sha256 = "00dfn8h47zw3wr7yya82vvp19wsw51whn8jwgayn4hkjd161s9nm";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool intltool

View file

@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
hicolor-icon-theme hicolor-icon-theme
]; ];
dontDropIconThemeCache = true;
mesonFlags = [ mesonFlags = [
"-Dvolume_icons=false" # Tries to install some icons to / "-Dvolume_icons=false" # Tries to install some icons to /
"-Dpalettes=false" # Don't install gimp and inkscape palette files "-Dpalettes=false" # Don't install gimp and inkscape palette files

View file

@ -11,7 +11,6 @@
, gtk3 , gtk3
, glib , glib
, gettext , gettext
, hicolor-icon-theme
, gobject-introspection , gobject-introspection
, wrapGAppsHook , wrapGAppsHook
}: }:
@ -62,7 +61,6 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib glib
gtk3 gtk3
hicolor-icon-theme
libgee libgee
]; ];

Some files were not shown because too many files have changed in this diff Show more