ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

xfsprogs: fix outputs and references

Browse Source
This commit is contained in:
Vladimír Čunát 2015-04-20 22:06:17 +02:00
parent 9a0485f0b0
commit e81e2785c7
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/profiles/base.nix
View File

@ -33,7 +33,7 @@
# Tools to create / manipulate filesystems. # Tools to create / manipulate filesystems.
pkgs.ntfsprogs # for resizing NTFS partitions pkgs.ntfsprogs # for resizing NTFS partitions
pkgs.dosfstools pkgs.dosfstools
pkgs.xfsprogs pkgs.xfsprogs.bin
pkgs.jfsutils pkgs.jfsutils
pkgs.f2fs-tools pkgs.f2fs-tools

4
nixos/modules/tasks/filesystems/xfs.nix
View File

@ -11,13 +11,13 @@ in
{ {
config = mkIf (any (fs: fs == "xfs") config.boot.supportedFilesystems) { 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.availableKernelModules = mkIf inInitrd [ "xfs" "crc32c" ];
boot.initrd.extraUtilsCommands = mkIf inInitrd 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. # Trick just to set 'sh' after the extraUtils nuke-refs.

2
pkgs/tools/filesystems/ceph/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
boost btrfsProgs cryptopp curl expat fcgi fuse gperftools keyutils boost btrfsProgs cryptopp curl expat fcgi fuse gperftools keyutils
libatomic_ops leveldb libaio libedit libuuid linuxHeaders openssl python libatomic_ops leveldb libaio libedit libuuid linuxHeaders openssl python
snappy udev xfsprogs.lib xz zfs snappy udev xfsprogs xz zfs
]; ];
preConfigure = '' preConfigure = ''

4
pkgs/tools/filesystems/xfsprogs/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gettext libuuid readline ]; buildInputs = [ gettext libuuid readline ];
outputs = [ "out" "lib" ]; outputs = [ "dev" "out" "bin" ];
preConfigure = '' preConfigure = ''
NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")" NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")"
@ -40,8 +40,6 @@ stdenv.mkDerivation rec {
"XGETTEXT=xgettext" "XGETTEXT=xgettext"
"--disable-lib64" "--disable-lib64"
"--enable-readline" "--enable-readline"
"--includedir=$(lib)/include"
"--libdir=$(lib)/lib"
]; ];
installFlags = [ "install-dev" ]; installFlags = [ "install-dev" ];