xfsprogs: fix outputs and references
This commit is contained in:
parent
9a0485f0b0
commit
e81e2785c7
|
@ -33,7 +33,7 @@
|
|||
# Tools to create / manipulate filesystems.
|
||||
pkgs.ntfsprogs # for resizing NTFS partitions
|
||||
pkgs.dosfstools
|
||||
pkgs.xfsprogs
|
||||
pkgs.xfsprogs.bin
|
||||
pkgs.jfsutils
|
||||
pkgs.f2fs-tools
|
||||
|
||||
|
|
|
@ -11,13 +11,13 @@ in
|
|||
{
|
||||
config = mkIf (any (fs: fs == "xfs") config.boot.supportedFilesystems) {
|
||||
|
||||
system.fsPackages = [ pkgs.xfsprogs ];
|
||||
system.fsPackages = [ pkgs.xfsprogs.bin ];
|
||||
|
||||
boot.initrd.availableKernelModules = mkIf inInitrd [ "xfs" "crc32c" ];
|
||||
|
||||
boot.initrd.extraUtilsCommands = mkIf inInitrd
|
||||
''
|
||||
copy_bin_and_libs ${pkgs.xfsprogs}/sbin/fsck.xfs
|
||||
copy_bin_and_libs ${pkgs.xfsprogs.bin}/bin/fsck.xfs
|
||||
'';
|
||||
|
||||
# Trick just to set 'sh' after the extraUtils nuke-refs.
|
||||
|
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
boost btrfsProgs cryptopp curl expat fcgi fuse gperftools keyutils
|
||||
libatomic_ops leveldb libaio libedit libuuid linuxHeaders openssl python
|
||||
snappy udev xfsprogs.lib xz zfs
|
||||
snappy udev xfsprogs xz zfs
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ gettext libuuid readline ];
|
||||
|
||||
outputs = [ "out" "lib" ];
|
||||
outputs = [ "dev" "out" "bin" ];
|
||||
|
||||
preConfigure = ''
|
||||
NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")"
|
||||
|
@ -40,8 +40,6 @@ stdenv.mkDerivation rec {
|
|||
"XGETTEXT=xgettext"
|
||||
"--disable-lib64"
|
||||
"--enable-readline"
|
||||
"--includedir=$(lib)/include"
|
||||
"--libdir=$(lib)/lib"
|
||||
];
|
||||
|
||||
installFlags = [ "install-dev" ];
|
||||
|
|
Loading…
Reference in a new issue