summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorChristoph Hrdinka <c.github@hrdinka.at>2014-04-23 09:39:58 +0200
committerSander van der Burg <svanderburg@gmail.com>2014-09-06 00:25:48 +0200
commit72b1f874ef0c43569516892b17c8893f0785bfef (patch)
treea5c98f8d47acc9b35e0a2744f7a3ba6cd57e82ef /pkgs
parentc5f51039f477880351edd0b765cb7bda839adb82 (diff)
downloadnixlib-72b1f874ef0c43569516892b17c8893f0785bfef.tar
nixlib-72b1f874ef0c43569516892b17c8893f0785bfef.tar.gz
nixlib-72b1f874ef0c43569516892b17c8893f0785bfef.tar.bz2
nixlib-72b1f874ef0c43569516892b17c8893f0785bfef.tar.lz
nixlib-72b1f874ef0c43569516892b17c8893f0785bfef.tar.xz
nixlib-72b1f874ef0c43569516892b17c8893f0785bfef.tar.zst
nixlib-72b1f874ef0c43569516892b17c8893f0785bfef.zip
buildFHSChrootEnv: fix merge error
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/build-support/build-fhs-chrootenv/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix
index 411e73ab8102..306cfeeb264d 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
 } :