diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-06 03:15:16 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-06 03:15:16 +0200 |
commit | e478b63b27f8a3e23a56867d5b320b0ae7210acd (patch) | |
tree | 80e69e01ae06a22bc422c9322e9361e8f6da5875 /pkgs/tools/misc | |
parent | aae11b178188a026c68953eab644b5b9a75a541c (diff) | |
parent | a0a6a3df88e6d1d3542dee0e8d7c8f71fb8293b9 (diff) | |
download | nixlib-e478b63b27f8a3e23a56867d5b320b0ae7210acd.tar nixlib-e478b63b27f8a3e23a56867d5b320b0ae7210acd.tar.gz nixlib-e478b63b27f8a3e23a56867d5b320b0ae7210acd.tar.bz2 nixlib-e478b63b27f8a3e23a56867d5b320b0ae7210acd.tar.lz nixlib-e478b63b27f8a3e23a56867d5b320b0ae7210acd.tar.xz nixlib-e478b63b27f8a3e23a56867d5b320b0ae7210acd.tar.zst nixlib-e478b63b27f8a3e23a56867d5b320b0ae7210acd.zip |
Merge pull request #14835 from groxxda/libcap
libcap: 2.24 -> 2.25, replace old split with multi-output
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/xfstests/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index 957582a3687f..5269955ebdf9 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -1,5 +1,5 @@ { stdenv, acl, attr, autoreconfHook, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk -, lib, libaio, libcap_progs, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, su +, lib, libaio, libcap, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, su , time, utillinux, which, writeScript, xfsprogs }: stdenv.mkDerivation { @@ -72,7 +72,7 @@ stdenv.mkDerivation { ln -s @out@/lib/xfstests/$f $f done - export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap_progs lvm2 perl procps psmisc su utillinux which xfsprogs]}:$PATH + export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap lvm2 perl procps psmisc su utillinux which xfsprogs]}:$PATH exec ./check "$@" ''; |