diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-22 23:23:53 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-22 23:23:53 +0100 |
| commit | 0a47a28f1df3bdf7b2cf074af84a432aa48cbba7 (patch) | |
| tree | 6c953c0d58cf6d178795383fefe9babddaa7da4e /pkgs/os-specific/linux/udisks | |
| parent | 3e2e62ca31311dd7e5237aa97a815458a44a3a3e (diff) | |
| parent | 296cd6600943d5a349cda55a36137331f8c3eec8 (diff) | |
| download | nixpkgs-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar nixpkgs-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.gz nixpkgs-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.bz2 nixpkgs-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.lz nixpkgs-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.xz nixpkgs-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.zst nixpkgs-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates
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 ea4fd1ca2cb..b53af52755f 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 |