diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-26 23:32:33 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-26 23:32:33 +0000 |
| commit | 1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5 (patch) | |
| tree | cba73be7e3108dca51f75c9ec44a8bd61246b11a /nixpkgs/nixos/modules/tasks | |
| parent | db8291322dd83add2250dd4480b46298655cbfba (diff) | |
| parent | 1233c8d9e9bc463899ed6a8cf0232e6bf36475ee (diff) | |
| download | nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.gz nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.bz2 nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.lz nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.xz nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.zst nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.zip | |
Merge commit '1233c8d9e9bc463899ed6a8cf0232e6bf36475ee'
Diffstat (limited to 'nixpkgs/nixos/modules/tasks')
| -rw-r--r-- | nixpkgs/nixos/modules/tasks/filesystems/vboxsf.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/nixos/modules/tasks/kbd.nix | 1 | ||||
| -rw-r--r-- | nixpkgs/nixos/modules/tasks/network-interfaces.nix | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/nixpkgs/nixos/modules/tasks/filesystems/vboxsf.nix b/nixpkgs/nixos/modules/tasks/filesystems/vboxsf.nix index 87f1984f084f..5497194f6a8d 100644 --- a/nixpkgs/nixos/modules/tasks/filesystems/vboxsf.nix +++ b/nixpkgs/nixos/modules/tasks/filesystems/vboxsf.nix @@ -6,7 +6,7 @@ let inInitrd = any (fs: fs == "vboxsf") config.boot.initrd.supportedFilesystems; - package = pkgs.runCommand "mount.vboxsf" {} '' + package = pkgs.runCommand "mount.vboxsf" { preferLocalBuild = true; } '' mkdir -p $out/bin cp ${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/mount.vboxsf $out/bin ''; diff --git a/nixpkgs/nixos/modules/tasks/kbd.nix b/nixpkgs/nixos/modules/tasks/kbd.nix index fbe42b8e8f04..6d34f897d189 100644 --- a/nixpkgs/nixos/modules/tasks/kbd.nix +++ b/nixpkgs/nixos/modules/tasks/kbd.nix @@ -15,6 +15,7 @@ let optimizedKeymap = pkgs.runCommand "keymap" { nativeBuildInputs = [ pkgs.buildPackages.kbd ]; LOADKEYS_KEYMAP_PATH = "${kbdEnv}/share/keymaps/**"; + preferLocalBuild = true; } '' loadkeys -b ${optionalString isUnicode "-u"} "${config.i18n.consoleKeyMap}" > $out ''; diff --git a/nixpkgs/nixos/modules/tasks/network-interfaces.nix b/nixpkgs/nixos/modules/tasks/network-interfaces.nix index 815523093dde..f9b0eb330bf8 100644 --- a/nixpkgs/nixos/modules/tasks/network-interfaces.nix +++ b/nixpkgs/nixos/modules/tasks/network-interfaces.nix @@ -995,7 +995,7 @@ in ''; environment.etc."hostid" = mkIf (cfg.hostId != null) - { source = pkgs.runCommand "gen-hostid" {} '' + { source = pkgs.runCommand "gen-hostid" { preferLocalBuild = true; } '' hi="${cfg.hostId}" ${if pkgs.stdenv.isBigEndian then '' echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > $out |