diff options
author | volth <volth@volth.com> | 2018-10-12 01:16:50 +0000 |
---|---|---|
committer | volth <volth@volth.com> | 2018-10-12 01:16:50 +0000 |
commit | dbb445736f74482780490c7ce4be07dbf2ac8e9c (patch) | |
tree | b2339ba568eb2af95c25d6938609be07ec180324 /nixos/modules/config | |
parent | 60ae563293ec956d683e3b9a62dbdef46f71437e (diff) | |
download | nixlib-dbb445736f74482780490c7ce4be07dbf2ac8e9c.tar nixlib-dbb445736f74482780490c7ce4be07dbf2ac8e9c.tar.gz nixlib-dbb445736f74482780490c7ce4be07dbf2ac8e9c.tar.bz2 nixlib-dbb445736f74482780490c7ce4be07dbf2ac8e9c.tar.lz nixlib-dbb445736f74482780490c7ce4be07dbf2ac8e9c.tar.xz nixlib-dbb445736f74482780490c7ce4be07dbf2ac8e9c.tar.zst nixlib-dbb445736f74482780490c7ce4be07dbf2ac8e9c.zip |
use buildPackages in environment.extraSetup
Diffstat (limited to 'nixos/modules/config')
-rw-r--r-- | nixos/modules/config/system-path.nix | 2 | ||||
-rw-r--r-- | nixos/modules/config/xdg/mime.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 3c24dab85e4d..c07e19bd03c4 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -140,7 +140,7 @@ in if [ -x $out/bin/glib-compile-schemas -a -w $out/share/glib-2.0/schemas ]; then $out/bin/glib-compile-schemas $out/share/glib-2.0/schemas fi - + ${config.environment.extraSetup} ''; }; diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix index 4323a49ea1dd..cd1064630fbc 100644 --- a/nixos/modules/config/xdg/mime.nix +++ b/nixos/modules/config/xdg/mime.nix @@ -24,11 +24,11 @@ with lib; environment.extraSetup = '' if [ -w $out/share/mime ] && [ -d $out/share/mime/packages ]; then - XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null + XDG_DATA_DIRS=$out/share ${pkgs.buildPackages.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null fi if [ -w $out/share/applications ]; then - ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications + ${pkgs.buildPackages.desktop-file-utils}/bin/update-desktop-database $out/share/applications fi ''; }; |