coreutils: use finalAttrs
This commit is contained in:
@@ -2,14 +2,11 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
autoreconfHook,
|
||||
buildPackages,
|
||||
libiconv,
|
||||
perl,
|
||||
texinfo,
|
||||
xz,
|
||||
binlore,
|
||||
coreutils,
|
||||
gmpSupport ? true,
|
||||
gmp,
|
||||
aclSupport ? lib.meta.availableOn stdenv.hostPlatform acl,
|
||||
@@ -46,12 +43,12 @@ let
|
||||
;
|
||||
isCross = (stdenv.hostPlatform != stdenv.buildPlatform);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "coreutils" + (optionalString (!minimal) "-full");
|
||||
version = "9.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/coreutils/coreutils-${version}.tar.xz";
|
||||
url = "mirror://gnu/coreutils/coreutils-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Gby2yoZxg8V9dxVerpRsXs7YgYMUO0XKUa19JsYoynU=";
|
||||
};
|
||||
|
||||
@@ -232,7 +229,7 @@ stdenv.mkDerivation rec {
|
||||
#
|
||||
# binlore only spots exec in runcon on some platforms (i.e., not
|
||||
# darwin; see comment on inverse case below)
|
||||
binlore.out = binlore.synthesize coreutils ''
|
||||
binlore.out = binlore.synthesize finalAttrs.finalPackage ''
|
||||
execer can bin/{chroot,env,install,nice,nohup,runcon,sort,split,stdbuf,timeout}
|
||||
execer cannot bin/{[,b2sum,base32,base64,basename,basenc,cat,chcon,chgrp,chmod,chown,cksum,comm,cp,csplit,cut,date,dd,df,dir,dircolors,dirname,du,echo,expand,expr,factor,false,fmt,fold,groups,head,hostid,id,join,kill,link,ln,logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,numfmt,od,paste,pathchk,pinky,pr,printenv,printf,ptx,pwd,readlink,realpath,rm,rmdir,seq,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,shred,shuf,sleep,stat,stty,sum,sync,tac,tail,tee,test,touch,tr,true,truncate,tsort,tty,uname,unexpand,uniq,unlink,uptime,users,vdir,wc,who,whoami,yes}
|
||||
'';
|
||||
@@ -242,7 +239,7 @@ stdenv.mkDerivation rec {
|
||||
# darwin; I have a note that the behavior may need selinux?).
|
||||
# hard-set it so people working on macOS don't miss cases of
|
||||
# runcon until ofBorg fails.
|
||||
binlore.out = binlore.synthesize coreutils ''
|
||||
binlore.out = binlore.synthesize finalAttrs.finalPackage ''
|
||||
execer can bin/runcon
|
||||
'';
|
||||
};
|
||||
@@ -263,4 +260,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = with lib.platforms; unix ++ windows;
|
||||
priority = 10;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user