diff options
| author | Michael Peyton Jones <me@michaelpj.com> | 2018-08-15 09:55:35 +0100 |
|---|---|---|
| committer | Michael Peyton Jones <me@michaelpj.com> | 2018-08-16 21:23:34 +0100 |
| commit | 13e2e19158bcd2b4d53e452d82f62817194100ef (patch) | |
| tree | 71a13eecf2ba743d8df7a57c3dc577dd4ae9d630 /nixos/modules/config/system-path.nix | |
| parent | 52e7817aa2c33b8569b6fdc884f98a34fbf6f61e (diff) | |
| download | nixpkgs-13e2e19158bcd2b4d53e452d82f62817194100ef.tar nixpkgs-13e2e19158bcd2b4d53e452d82f62817194100ef.tar.gz nixpkgs-13e2e19158bcd2b4d53e452d82f62817194100ef.tar.bz2 nixpkgs-13e2e19158bcd2b4d53e452d82f62817194100ef.tar.lz nixpkgs-13e2e19158bcd2b4d53e452d82f62817194100ef.tar.xz nixpkgs-13e2e19158bcd2b4d53e452d82f62817194100ef.tar.zst nixpkgs-13e2e19158bcd2b4d53e452d82f62817194100ef.zip | |
xdg: add modules for supporting various XDG specs
Diffstat (limited to 'nixos/modules/config/system-path.nix')
| -rw-r--r-- | nixos/modules/config/system-path.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 36115166501..a07a40e86bd 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -107,12 +107,7 @@ in "/etc/gtk-3.0" "/lib" # FIXME: remove and update debug-info.nix "/sbin" - "/share/applications" - "/share/desktop-directories" "/share/emacs" - "/share/icons" - "/share/menus" - "/share/mime" "/share/nano" "/share/org" "/share/themes" @@ -132,10 +127,6 @@ in # outputs TODO: note that the tools will often not be linked by default postBuild = '' - if [ -x $out/bin/update-mime-database -a -w $out/share/mime ]; then - XDG_DATA_DIRS=$out/share $out/bin/update-mime-database -V $out/share/mime > /dev/null - fi - if [ -x $out/bin/gtk-update-icon-cache -a -f $out/share/icons/hicolor/index.theme ]; then $out/bin/gtk-update-icon-cache $out/share/icons/hicolor fi @@ -144,16 +135,16 @@ in $out/bin/glib-compile-schemas $out/share/glib-2.0/schemas fi - if [ -x $out/bin/update-desktop-database -a -w $out/share/applications ]; then - $out/bin/update-desktop-database $out/share/applications - fi - if [ -x $out/bin/install-info -a -w $out/share/info ]; then shopt -s nullglob for i in $out/share/info/*.info $out/share/info/*.info.gz; do $out/bin/install-info $i $out/share/info/dir done fi + '' ++ optionalString config.xdg.mime.enable '' + XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null + + ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications ''; }; |