diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-11 11:41:18 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-11 11:41:18 +0300 |
| commit | 2b0eace6cf021eed7123fb828483a00c95796829 (patch) | |
| tree | dcc5c40823ad9d7804bfec4145e3e9fa26db0400 /pkgs/os-specific | |
| parent | a49cb9dcbee0fe82a5e04ff4d90c376761fd9f18 (diff) | |
| parent | c922c20cff06aeb92136efb4d14d5a4bbbcc3a45 (diff) | |
| download | nixpkgs-2b0eace6cf021eed7123fb828483a00c95796829.tar nixpkgs-2b0eace6cf021eed7123fb828483a00c95796829.tar.gz nixpkgs-2b0eace6cf021eed7123fb828483a00c95796829.tar.bz2 nixpkgs-2b0eace6cf021eed7123fb828483a00c95796829.tar.lz nixpkgs-2b0eace6cf021eed7123fb828483a00c95796829.tar.xz nixpkgs-2b0eace6cf021eed7123fb828483a00c95796829.tar.zst nixpkgs-2b0eace6cf021eed7123fb828483a00c95796829.zip | |
Merge remote-tracking branch 'upstream/staging' into master
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 0cc7a8a4548..b777042d601 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { ./rtcwake-search-PATH-for-shutdown.patch ]; - outputs = [ "bin" "out" "man" ]; # TODO: $bin is kept the first for now - # due to lots of ${utillinux}/bin occurences and headers being rather small - outputDev = "bin"; + outputs = [ "bin" "dev" "out" "man" ]; #FIXME: make it also work on non-nixos? postPatch = '' |