diff options
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r-- | pkgs/tools/filesystems/e2fsprogs/default.nix | 23 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/lvm2.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/filesystems/svnfs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/xfsprogs/default.nix | 4 |
7 files changed, 35 insertions, 28 deletions
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index a53e93960aef4..c091158bff635 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar"; }; - buildInputs = [ pkgconfig libuuid ]; + outputs = [ "bin" "out" "man" ]; + outputDev = "bin"; # just for *.pc + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libuuid ]; crossAttrs = { preConfigure = '' @@ -16,14 +20,19 @@ stdenv.mkDerivation rec { ''; }; - # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency). - configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck --enable-symlink-install"; - - enableParallelBuilding = true; + configureFlags = [ + "--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks" + # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency). + "--disable-libuuid" "--disable-uuidd" "--disable-libblkid" "--disable-fsck" + ]; - preInstall = "installFlagsArray=('LN=ln -s')"; + # hacky way to make it install *.pc + postInstall = '' + make install-libs + rm "$out"/lib/*.a + ''; - postInstall = "make install-libs"; + enableParallelBuilding = true; meta = { homepage = http://e2fsprogs.sourceforge.net/; diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index d4129f4d390ac..1776c30ecae0a 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock , libselinux, cryptsetup, multipath_tools, lsof, utillinux -, useNixUdev ? true, udev ? null +, useNixUdev ? true, libudev ? null }: -assert useNixUdev -> udev != null; +assert useNixUdev -> libudev != null; buildPythonPackage rec { name = "blivet-${version}"; @@ -21,21 +21,21 @@ buildPythonPackage rec { sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \ blivet/devicelibs/mpath.py blivet/devices.py sed -i -e '/"wipefs"/ { - s|wipefs|${utillinux}/sbin/wipefs| + s|wipefs|${utillinux.bin}/sbin/wipefs| s/-f/--force/ }' blivet/formats/__init__.py sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py - sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py + sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py '' + stdenv.lib.optionalString useNixUdev '' sed -i -e '/find_library/,/find_library/ { - c libudev = "${udev}/lib/libudev.so.1" + c libudev = "${libudev.out}/lib/libudev.so.1" }' blivet/pyudev.py ''; propagatedBuildInputs = [ pykickstart pyparted pyblock libselinux cryptsetup - ] ++ stdenv.lib.optional useNixUdev udev; + ] ++ stdenv.lib.optional useNixUdev libudev; # tests are currently _heavily_ broken upstream doCheck = false; diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 01a3caafc5ddf..cbedf6a70a5d7 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -12,7 +12,7 @@ let inherit stdenv fetchurl buildPythonPackage; inherit pykickstart pyparted pyblock cryptsetup multipath_tools; inherit useNixUdev; - inherit (pkgs) lsof utillinux udev; + inherit (pkgs) lsof utillinux libudev; libselinux = pkgs.libselinux.override { enablePython = true; }; }; @@ -29,12 +29,12 @@ let lvm2 = import ./lvm2.nix { inherit stdenv fetchurl; - inherit (pkgs) pkgconfig utillinux udev coreutils; + inherit (pkgs) pkgconfig utillinux libudev systemd coreutils; }; multipath_tools = import ./multipath-tools.nix { inherit stdenv fetchurl lvm2; - inherit (pkgs) readline udev libaio gzip; + inherit (pkgs) readline systemd libaio gzip; }; parted = import ./parted.nix { diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index 9e2b0c9007947..b92c40ba99e62 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }: +{ stdenv, fetchurl, pkgconfig, libudev, systemd, utillinux, coreutils }: let v = "2.02.106"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { configureFlags = "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib"; - buildInputs = [ pkgconfig udev ]; + buildInputs = [ pkgconfig libudev ]; preConfigure = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation { --replace /usr/bin/tr ${coreutils}/bin/tr substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ --replace /usr/sbin/lvm $out/sbin/lvm \ - --replace /usr/bin/udevadm ${udev}/bin/udevadm + --replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm sed -i /DEFAULT_SYS_DIR/d Makefile.in sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in @@ -42,7 +42,7 @@ stdenv.mkDerivation { postInstall = '' substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \ - --replace $out/sbin/blkid ${utillinux}/sbin/blkid + --replace $out/sbin/blkid ${utillinux.bin}/sbin/blkid # Systemd stuff mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index 90722d74ace15..b78605504bf88 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lvm2, libaio, gzip, readline, udev }: +{ stdenv, fetchurl, lvm2, libaio, gzip, readline, systemd }: stdenv.mkDerivation rec { name = "multipath-tools-0.4.9"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup - substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id - substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id + substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${systemd.udev.lib}/lib/udev/scsi_id + substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${systemd.udev.lib}/lib/udev/scsi_id ''; meta = { diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index fba066d0f4cb4..3337141821770 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -12,10 +12,10 @@ stdenv.mkDerivation { # why is this required? preConfigure='' - export LD_LIBRARY_PATH=${subversion}/lib + export LD_LIBRARY_PATH=${subversion.out}/lib ''; - NIX_CFLAGS_COMPILE="-I ${subversion}/include/subversion-1"; + NIX_CFLAGS_COMPILE="-I ${subversion.dev}/include/subversion-1"; NIX_LDFLAGS="-lsvn_client-1"; meta = { diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index de61809a1aea9..e30f67af3e951 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext libuuid readline ]; - outputs = [ "out" "lib" ]; + outputs = [ "dev" "out" "bin" ]; # TODO: review xfs preConfigure = '' NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")" @@ -39,8 +39,6 @@ stdenv.mkDerivation rec { "XGETTEXT=xgettext" "--disable-lib64" "--enable-readline" - "--includedir=$(lib)/include" - "--libdir=$(lib)/lib" ]; installFlags = [ "install-dev" ]; |