public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

e2fsprogs dynamically loads some library, even if it's statically linked. 

svn path=/nixu/trunk/; revision=4505
This commit is contained in:
Armijn Hemel 2006-01-07 15:42:59 +00:00
parent 9cbf8a84fb
commit 77b661cfab
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, kernel, bash, bashStatic, coreutils, findutilsWrapper, utillinux, utillinuxStatic, sysvinit, e2fsprogs { stdenv, bash, bashStatic, coreutils, findutilsWrapper, utillinux, utillinuxStatic, sysvinit, e2fsprogs
, nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
, binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
, gnutar, gzip, mingettyWrapper, grubWrapper, parted, module_init_tools, hotplug , gnutar, gzip, mingettyWrapper, grubWrapper, parted, module_init_tools, hotplug
@ -12,7 +12,7 @@ derivation {
halt = ./halt.sh; halt = ./halt.sh;
login = ./login.sh; login = ./login.sh;
env = ./env.sh; env = ./env.sh;
inherit stdenv kernel bash bashStatic coreutils findutilsWrapper utillinux sysvinit inherit stdenv bash bashStatic coreutils findutilsWrapper utillinux sysvinit
e2fsprogs nettools nix subversion gcc wget which vim less screen e2fsprogs nettools nix subversion gcc wget which vim less screen
openssh binutils strace shadowutils iputils gnumake curl gnused openssh binutils strace shadowutils iputils gnumake curl gnused
gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools

8
make-disk.sh
View File

@ -225,20 +225,14 @@ chmod u+x ${initdir}/fill-disk.sh
chmod u+x ${initdir}/ramdisk-login.sh chmod u+x ${initdir}/ramdisk-login.sh
#cp -fau --parents ${utilLinux} ${initdir} #cp -fau --parents ${utilLinux} ${initdir}
#cp -fau --parents ${coreUtilsDiet} ${initdir} #cp -fau --parents ${coreUtilsDiet} ${initdir}
#cp -fau --parents ${e2fsProgs} ${initdir}
#cp -fau --parents ${modUtils} ${initdir} #cp -fau --parents ${modUtils} ${initdir}
#cp -fau --parents ${hotplug} ${initdir} #cp -fau --parents ${hotplug} ${initdir}
cp -fau --parents ${bash}/bin ${initdir} cp -fau --parents ${bash}/bin ${initdir}
cp -fau --parents ${utilLinux}/bin ${initdir} cp -fau --parents ${utilLinux}/bin ${initdir}
chmod -R u+w ${initdir} chmod -R u+w ${initdir}
echo utilLinux $utilLinux
cp -fau --parents ${utilLinux}/sbin ${initdir} cp -fau --parents ${utilLinux}/sbin ${initdir}
echo coreutils cp -fau --parents ${e2fsProgs} ${initdir}
cp -fau --parents ${coreutilsdiet}/bin ${initdir} cp -fau --parents ${coreutilsdiet}/bin ${initdir}
cp -fau --parents ${e2fsprogs}/bin ${initdir}
chmod -R u+w ${initdir}
echo e2fsprogs
cp -fau --parents ${e2fsprogs}/sbin ${initdir}
cp -fau --parents ${modutils}/bin ${initdir} cp -fau --parents ${modutils}/bin ${initdir}
chmod -R u+w ${initdir} chmod -R u+w ${initdir}
echo modutils echo modutils

6
pkgs.nix
View File

@ -5,9 +5,9 @@ rec {
nettools nix subversion gcc wget which vim less screen openssh binutils nettools nix subversion gcc wget which vim less screen openssh binutils
strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic hotplug udev mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic hotplug udev
dhcpWrapper man nano eject sysklogd kudzu; dhcpWrapper man nano eject sysklogd kudzu xawtv;
boot = (import ./boot) {inherit stdenv kernel bash bashStatic coreutils findutilsWrapper boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper
utillinux utillinuxStatic sysvinit e2fsprogs nettools nix subversion gcc wget which vim utillinux utillinuxStatic sysvinit e2fsprogs nettools nix subversion gcc wget which vim
less screen openssh binutils strace shadowutils iputils gnumake curl less screen openssh binutils strace shadowutils iputils gnumake curl
gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
@ -17,5 +17,5 @@ rec {
nix shadowutils mingettyWrapper grubWrapper parted module_init_tools hotplug nix shadowutils mingettyWrapper grubWrapper parted module_init_tools hotplug
dhcpWrapper man nano eject;}; dhcpWrapper man nano eject;};
everything = [boot sysvinit kernel sysklogd kudzu]; everything = [boot sysvinit sysklogd kernel xawtv];
} }