diff --git a/fiv-master.nix b/fiv-master.nix index 7c549a2..c182be8 100644 --- a/fiv-master.nix +++ b/fiv-master.nix @@ -24,6 +24,7 @@ pkgs.stdenv.mkDerivation rec { gtk3 libwebp libraw + shared-mime-info # WIP libepoxy @@ -76,10 +77,12 @@ pkgs.stdenv.mkDerivation rec { ]; # See nixpkgs commit b1e73fa2e086f1033a33d93524ae2a1781d12b95 about icons. - # It used to work automatically. + # It might make sense to name {hicolor,gnome.adwaita}-icon-theme/share + # explicitly, to limit undesired dependencies. preFixup = '' gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" + --prefix XDG_DATA_DIRS : "${pkgs.shared-mime-info}/share" --prefix PATH : $out/bin:${pkgs.lib.makeBinPath [ pkgs.exiftool ]} ) ''; diff --git a/logdiag-master.nix b/logdiag-master.nix index 6f06748..679e31d 100644 --- a/logdiag-master.nix +++ b/logdiag-master.nix @@ -55,7 +55,8 @@ pkgs.stdenv.mkDerivation rec { ]; # See nixpkgs commit b1e73fa2e086f1033a33d93524ae2a1781d12b95 about icons. - # It used to work automatically. + # It might make sense to name {hicolor,gnome.adwaita}-icon-theme/share + # explicitly, to limit undesired dependencies. preFixup = '' gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"