diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-12 22:35:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 22:35:11 +0100 |
| commit | 6a5e62e5e63675204e67346cbf68098647a59100 (patch) | |
| tree | 8657e18e1370a46829672962d4b56c00d5a662f7 /nixos | |
| parent | 156d2fbf5da67e46f5b77b4c64cb189a25409d1d (diff) | |
| parent | dbb445736f74482780490c7ce4be07dbf2ac8e9c (diff) | |
| download | nixlib-6a5e62e5e63675204e67346cbf68098647a59100.tar nixlib-6a5e62e5e63675204e67346cbf68098647a59100.tar.gz nixlib-6a5e62e5e63675204e67346cbf68098647a59100.tar.bz2 nixlib-6a5e62e5e63675204e67346cbf68098647a59100.tar.lz nixlib-6a5e62e5e63675204e67346cbf68098647a59100.tar.xz nixlib-6a5e62e5e63675204e67346cbf68098647a59100.tar.zst nixlib-6a5e62e5e63675204e67346cbf68098647a59100.zip | |
Merge pull request #48248 from volth/environment.extraSetup
use buildPackages in environment.extraSetup
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/config/system-path.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/config/xdg/mime.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/misc/documentation.nix | 2 |
3 files changed, 4 insertions, 4 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 ''; }; diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 6a7105e9cdaa..09d53c322fb3 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -166,7 +166,7 @@ in if [ -w $out/share/info ]; then shopt -s nullglob for i in $out/share/info/*.info $out/share/info/*.info.gz; do - ${pkgs.texinfo}/bin/install-info $i $out/share/info/dir + ${pkgs.buildPackages.texinfo}/bin/install-info $i $out/share/info/dir done fi ''; |