From 72b1f874ef0c43569516892b17c8893f0785bfef Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Wed, 23 Apr 2014 09:39:58 +0200 Subject: [PATCH] buildFHSChrootEnv: fix merge error --- pkgs/build-support/build-fhs-chrootenv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix index 411e73ab810..306cfeeb264 100644 --- a/pkgs/build-support/build-fhs-chrootenv/default.nix +++ b/pkgs/build-support/build-fhs-chrootenv/default.nix @@ -1,6 +1,6 @@ { buildEnv, nixpkgs, nixpkgs_i686, system , stdenv, glibc, glibc_multi, glibcLocales -, bashInteractive, coreutils, less, shadow su +, bashInteractive, coreutils, less, shadow, su , gawk, gcc, diffutils, findutils, gnused, gnugrep , gnutar, gzip, bzip2, xz } :