summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2011-12-11 19:39:12 +0000
committerPeter Simons <simons@cryp.to>2011-12-11 19:39:12 +0000
commitba935dcbc03b8a51f91bb62fb131830b99e66855 (patch)
tree60b409c916d8f9d528d3de4e8fb51df7abd34636 /pkgs/os-specific
parentc561cbe8c874f794cba04d5c2805497b9ecf05ed (diff)
downloadnixpkgs-ba935dcbc03b8a51f91bb62fb131830b99e66855.tar
nixpkgs-ba935dcbc03b8a51f91bb62fb131830b99e66855.tar.gz
nixpkgs-ba935dcbc03b8a51f91bb62fb131830b99e66855.tar.bz2
nixpkgs-ba935dcbc03b8a51f91bb62fb131830b99e66855.tar.lz
nixpkgs-ba935dcbc03b8a51f91bb62fb131830b99e66855.tar.xz
nixpkgs-ba935dcbc03b8a51f91bb62fb131830b99e66855.tar.zst
nixpkgs-ba935dcbc03b8a51f91bb62fb131830b99e66855.zip
upgraded cryptsetup
svn path=/nixpkgs/trunk/; revision=30839
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/cryptsetup/default.nix16
1 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index 765a49c6446..962de55a156 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -1,19 +1,13 @@
-{stdenv, fetchurl, libuuid, popt, devicemapper, udev }:
+{stdenv, fetchurl, libuuid, popt, devicemapper, libgcrypt }:
 
 stdenv.mkDerivation {
-  name = "cryptsetup-1.0.6";
+  name = "cryptsetup-1.4.1";
   src = fetchurl {
-    url = http://cryptsetup.googlecode.com/files/cryptsetup-1.0.6.tar.bz2;
-    sha256 = "df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd";
+    url = http://cryptsetup.googlecode.com/files/cryptsetup-1.4.1.tar.bz2;
+    sha256 = "82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb";
   };
 
-  configureFlags = [ "--enable-libdevmapper" ];
-
-  patchPhase = ''
-    sed -i -e 's@/sbin/udevsettle@${udev}/sbin/udevadm settle@' lib/libdevmapper.c
-  '';
-
-  buildInputs = [ libuuid popt devicemapper ];
+  buildInputs = [ libuuid popt devicemapper libgcrypt ];
 
   meta = {
     homepage = http://code.google.com/p/cryptsetup/;