dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

libcap: Replace occurences of libcap_progs with libcap.out

Browse Source
This commit is contained in:
Alexander Ried 2016-04-19 23:25:26 +02:00
parent 7382afac40
commit 5c295a4925
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix
View File

@ -1,13 +1,12 @@
{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kconfig, kcrash { kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kconfig, kcrash
, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap , kdoctools, ki18n, kio, kservice, kwindowsystem, libcap
, libcap_progs
}: }:
# TODO: setuid wrapper # TODO: setuid wrapper
kdeFramework { kdeFramework {
name = "kinit"; name = "kinit";
nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; nativeBuildInputs = [ extra-cmake-modules kdoctools libcap.out ];
buildInputs = [ kconfig kcrash kservice libcap ]; buildInputs = [ kconfig kcrash kservice libcap ];
propagatedBuildInputs = [ ki18n kio kwindowsystem ]; propagatedBuildInputs = [ ki18n kio kwindowsystem ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

4
pkgs/tools/misc/xfstests/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, acl, attr, autoreconfHook, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk { 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 }: , time, utillinux, which, writeScript, xfsprogs }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -72,7 +72,7 @@ stdenv.mkDerivation {
ln -s @out@/lib/xfstests/$f $f ln -s @out@/lib/xfstests/$f $f
done 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 "$@" exec ./check "$@"
''; '';