forked from mirrors/nixpkgs
treewide: gnome3.defaultIconTheme -> gnome3.adwaita-icon-theme
Fix building with `config.allowAliases = false;`.
This commit is contained in:
parent
b702a56d41
commit
9517398973
|
@ -186,7 +186,7 @@ stdenv.mkDerivation rec {
|
|||
makeWrapperArgs = with passthru.libraries; [
|
||||
"--prefix XDG_DATA_DIRS : ${base}/share"
|
||||
"--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share"
|
||||
"--prefix XDG_DATA_DIRS : ${gnome3.defaultIconTheme}/share"
|
||||
"--prefix XDG_DATA_DIRS : ${gnome3.adwaita-icon-theme}/share"
|
||||
"--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}"
|
||||
"--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
|
||||
# wrapGAppsHook did these two as well, no idea if it matters...
|
||||
|
|
|
@ -127,7 +127,7 @@ self = stdenv.mkDerivation {
|
|||
buildInputs = [ ncurses ] ++ ocamlBuildInputs
|
||||
++ optionals buildIde
|
||||
(if versionAtLeast "8.10"
|
||||
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ]
|
||||
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.adwaita-icon-theme wrapGAppsHook ]
|
||||
else [ ocamlPackages.lablgtk ]);
|
||||
|
||||
postPatch = ''
|
||||
|
|
Loading…
Reference in a new issue