diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-13 13:14:58 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-13 13:14:58 +0100 |
| commit | b11e1305b51eff17ef10bf375031be0749f4812a (patch) | |
| tree | c6a32395433b1c858b038b1f3a83a48102dc2a42 /pkgs/os-specific/linux/udisks | |
| parent | 726b1bebbc3f4c50a0e4b6b152f35b3b537fd389 (diff) | |
| download | nixpkgs-b11e1305b51eff17ef10bf375031be0749f4812a.tar nixpkgs-b11e1305b51eff17ef10bf375031be0749f4812a.tar.gz nixpkgs-b11e1305b51eff17ef10bf375031be0749f4812a.tar.bz2 nixpkgs-b11e1305b51eff17ef10bf375031be0749f4812a.tar.lz nixpkgs-b11e1305b51eff17ef10bf375031be0749f4812a.tar.xz nixpkgs-b11e1305b51eff17ef10bf375031be0749f4812a.tar.zst nixpkgs-b11e1305b51eff17ef10bf375031be0749f4812a.zip | |
udisks: Hack to work with the latest udev
We should probably update to udisks2, but I'm not sure if it's compatible at the D-Bus interface level. http://hydra.nixos.org/build/3488623
Diffstat (limited to 'pkgs/os-specific/linux/udisks')
| -rw-r--r-- | pkgs/os-specific/linux/udisks/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/udisks/no-pci-db.patch | 13 |
2 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/default.nix index 4987e90429c..b46efd46874 100644 --- a/pkgs/os-specific/linux/udisks/default.nix +++ b/pkgs/os-specific/linux/udisks/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5"; }; - patches = [ ./purity.patch ]; + patches = [ ./purity.patch ./no-pci-db.patch ]; postPatch = '' @@ -30,11 +30,6 @@ stdenv.mkDerivation rec { configureFlags = "--localstatedir=/var --enable-lvm2"; - preConfigure = - '' - # Ensure that udisks can find the necessary programs. - ''; - meta = { homepage = http://www.freedesktop.org/wiki/Software/udisks; description = "A daemon and command-line utility for querying and manipulating storage devices"; diff --git a/pkgs/os-specific/linux/udisks/no-pci-db.patch b/pkgs/os-specific/linux/udisks/no-pci-db.patch new file mode 100644 index 00000000000..b323b515c40 --- /dev/null +++ b/pkgs/os-specific/linux/udisks/no-pci-db.patch @@ -0,0 +1,13 @@ +Systemd no longer has the pci-db program. + +diff -ru -x '*~' udisks-1.0.4-orig/data/80-udisks.rules udisks-1.0.4/data/80-udisks.rules +--- udisks-1.0.4-orig/data/80-udisks.rules 2011-08-25 23:31:20.000000000 +0200 ++++ udisks-1.0.4/data/80-udisks.rules 2012-12-13 13:06:52.189650854 +0100 +@@ -3,7 +3,6 @@ + + # import names for PCI storage controllers + # +-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p" + + # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure + # the device is on a cardbus controller (upper PCI device) - then we check |