diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-07 13:16:26 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-07 13:16:26 +0200 |
commit | 95b828de42adaa2f825e5588d1cccb0d6398b20a (patch) | |
tree | abfa4798c91b9932173212e7fbc6e5f7bd85f5d6 /nixos/modules/installer/tools/tools.nix | |
parent | 421ce6439c2e685065fe9c256b751225de51e0b3 (diff) | |
parent | 1ecae5c2c123c0ca615d011b9ce32f501198e7c4 (diff) | |
download | nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.gz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.bz2 nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.lz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.xz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.zst nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.zip |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'nixos/modules/installer/tools/tools.nix')
-rw-r--r-- | nixos/modules/installer/tools/tools.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index f7fac75eb069..39da2f1f0be6 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -1,7 +1,7 @@ # This module generates nixos-install, nixos-rebuild, # nixos-generate-config, etc. -{ config, pkgs, modulesPath, ... }: +{ config, pkgs, modulesPath, lib, ... }: let @@ -65,7 +65,7 @@ let test -e "$out/chrome/content/jquery-1.5.2.js" || cp -f "$jquery" "$out/chrome/content/jquery-1.5.2.js" ''; - gui = pkgs.lib.cleanSource "${modulesPath}/../gui"; + gui = lib.cleanSource "${modulesPath}/../gui"; jquery = pkgs.fetchurl { url = http://code.jquery.com/jquery-1.5.2.min.js; sha256 = "8f0a19ee8c606b35a10904951e0a27da1896eafe33c6e88cb7bcbe455f05a24a"; |