udisks: split to udisks1 (stays default) and udisks2

This commit is contained in:
Vladimír Čunát 2013-04-01 18:12:32 +02:00 committed by Sergey Mironov
parent 0caed13c85
commit 7ce97cc443
3 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,38 @@
{ stdenv, fetchurl, pkgconfig, intltool
, expat, acl, udev, glib, libatasmart, polkit
, libxslt, docbook_xsl, utillinux, mdadm
}:
stdenv.mkDerivation rec {
name = "udisks-2.1.0";
src = fetchurl {
url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2";
sha256 = "1a0mipihilscv9jwy59xrqn2kkri9p12a09anpjdld83l7jhh0ii";
};
postPatch =
''
substituteInPlace src/main.c --replace \
"/sbin:/bin:/usr/sbin:/usr/bin" \
"${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin"
'';
nativeBuildInputs = [ pkgconfig intltool ];
propagatedBuildInputs = [ expat acl udev glib libatasmart polkit ]; # in closure anyway
buildInputs = [ libxslt docbook_xsl ];
configureFlags = [
"--localstatedir=/var"
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
"--with-udevdir=$(out)/lib/udev"
];
meta = {
homepage = http://www.freedesktop.org/wiki/Software/udisks;
description = "A daemon and command-line utility for querying and manipulating storage devices";
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -6254,7 +6254,9 @@ let
udev145 = callPackage ../os-specific/linux/udev/145.nix { };
udev = pkgs.systemd;
udisks = callPackage ../os-specific/linux/udisks { };
udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };
udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };
udisks = udisks1;
untie = callPackage ../os-specific/linux/untie { };