From e81e2785c7687aac2415d9bdf2d1216b83401942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Apr 2015 22:06:17 +0200
Subject: [PATCH] xfsprogs: fix outputs and references
---
nixos/modules/profiles/base.nix | 2 +-
nixos/modules/tasks/filesystems/xfs.nix | 4 ++--
pkgs/tools/filesystems/ceph/default.nix | 2 +-
pkgs/tools/filesystems/xfsprogs/default.nix | 4 +---
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 457642d82f7..5211b905002 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -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
diff --git a/nixos/modules/tasks/filesystems/xfs.nix b/nixos/modules/tasks/filesystems/xfs.nix
index d7c3930f4a3..c6a90bcf1a5 100644
--- a/nixos/modules/tasks/filesystems/xfs.nix
+++ b/nixos/modules/tasks/filesystems/xfs.nix
@@ -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.
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 7fd547099a2..6fd6993937e 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -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 = ''
diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index c01fc6ff4b3..7b38e74d04b 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -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" ];