diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-01 18:12:32 +0200 |
|---|---|---|
| committer | Sergey Mironov <ierton@gmail.com> | 2013-04-04 12:02:53 +0400 |
| commit | 7ce97cc443485c8d455312652dc0765f08107cf2 (patch) | |
| tree | a3093ec0e7a2fb6aff8ca398c5f93baae96b6478 | |
| parent | 0caed13c85830b6e54b5cf65cc27cbec36041393 (diff) | |
| download | nixlib-7ce97cc443485c8d455312652dc0765f08107cf2.tar nixlib-7ce97cc443485c8d455312652dc0765f08107cf2.tar.gz nixlib-7ce97cc443485c8d455312652dc0765f08107cf2.tar.bz2 nixlib-7ce97cc443485c8d455312652dc0765f08107cf2.tar.lz nixlib-7ce97cc443485c8d455312652dc0765f08107cf2.tar.xz nixlib-7ce97cc443485c8d455312652dc0765f08107cf2.tar.zst nixlib-7ce97cc443485c8d455312652dc0765f08107cf2.zip | |
udisks: split to udisks1 (stays default) and udisks2
| -rw-r--r-- | pkgs/os-specific/linux/udisks/1-default.nix (renamed from pkgs/os-specific/linux/udisks/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/udisks/2-default.nix | 38 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 41 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index b53af52755fa..b53af52755fa 100644 --- a/pkgs/os-specific/linux/udisks/default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix new file mode 100644 index 000000000000..b7be51c56fcc --- /dev/null +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c75a98a6f24d..3e0c04b035ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |