Merge pull request #283324 from mfrischknecht/fix-stratisd-build
stratisd: fix build due to unused imports
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
, cargo
|
||||
, rustc
|
||||
@@ -43,6 +44,22 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Can be removed with the next release after v. 3.6.3
|
||||
(fetchpatch {
|
||||
name = "remove-unused-imports.patch";
|
||||
url = "https://github.com/stratis-storage/stratisd/commit/78440de6e6ed8eab5ddd25dbdfb7804d0698f2a2.patch";
|
||||
hash = "sha256-RW2nyAWaoIbqrgbhCApQsMXkJWtWoOWL3VO7fIImJgY=";
|
||||
})
|
||||
|
||||
# Can be removed with the next release after v. 3.6.3
|
||||
(fetchpatch {
|
||||
name = "flag-import-not-used-in-build-as-test-only.patch";
|
||||
url = "https://github.com/stratis-storage/stratisd/commit/0d1c67f71338d0ee6c1e6aa06f7fd6264ce9a4c5.patch";
|
||||
hash = "sha256-6Nb8izUqYUirjy0dTFhITxoM/AKoChoc0w6Qm9K6+7I=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace udev/61-stratisd.rules \
|
||||
--replace stratis-base32-decode "$out/lib/udev/stratis-base32-decode" \
|
||||
|
||||
Reference in New Issue
Block a user