summary refs log tree commit diff
path: root/pkgs/tools/filesystems
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2016-08-11 00:49:05 +0300
committerTuomas Tynkkynen <tuomas@tuxera.com>2016-08-11 00:50:16 +0300
commit17132558276c20f744d3a53cb9d73849e697c8e5 (patch)
tree7eccea1912f088593f4c6e09990a38e111a5415e /pkgs/tools/filesystems
parentab8b78f6a36b53fe2d07f89e921bd020a42aa16e (diff)
downloadnixlib-17132558276c20f744d3a53cb9d73849e697c8e5.tar
nixlib-17132558276c20f744d3a53cb9d73849e697c8e5.tar.gz
nixlib-17132558276c20f744d3a53cb9d73849e697c8e5.tar.bz2
nixlib-17132558276c20f744d3a53cb9d73849e697c8e5.tar.lz
nixlib-17132558276c20f744d3a53cb9d73849e697c8e5.tar.xz
nixlib-17132558276c20f744d3a53cb9d73849e697c8e5.tar.zst
nixlib-17132558276c20f744d3a53cb9d73849e697c8e5.zip
ceph: Add xfsprogs 4.5.0 compat patch
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r--pkgs/tools/filesystems/ceph/default.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index b5d62482bf51..334525e79026 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchgit, ... } @ args:
+{ callPackage, fetchgit, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "9.2.0";
@@ -9,5 +9,12 @@ callPackage ./generic.nix (args // rec {
     sha256 = "0a2v3bgkrbkzardcw7ymlhhyjlwi08qmcm7g34y2sjsxk9bd78an";
   };
 
-  patches = [ ./fix-pythonpath.patch ];
+  patches = [
+    ./fix-pythonpath.patch
+    # For building with xfsprogs 4.5.0:
+    (fetchpatch {
+      url = "https://github.com/ceph/ceph/commit/602425abd5cef741fc1b5d4d1dd70c68e153fc8d.patch";
+      sha256 = "1iyf0ml2n50ki800vjich8lvzmcdviwqwkbs6cdj0vqv2nc5ii1g";
+    })
+  ];
 })