From 30340239768cf33b4b1b80671315a3dda1a19bf4 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 9 Jan 2019 15:13:54 +0100 Subject: [PATCH] exfat-nofuse: fix build for 4.18 additionally we use the PR 137 instead of the patch files from AUR. This avoids changes in source files and pins the patch to exactly what we want It also removes one fetchpatch call --- pkgs/os-specific/linux/exfat/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index 6120c707ba7..036cd3f28a1 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -28,16 +28,12 @@ stdenv.mkDerivation rec { ''; patches = [ - # fix compile-errors in 4.18 + # fix compile-errors in 4.18 and 4.20 + # ref: https://github.com/dorimanx/exfat-nofuse/pull/137 (fetchpatch { - url = https://aur.archlinux.org/cgit/aur.git/plain/4.18.patch?h=exfat-dkms-git; - sha256 = "18l5h631w8yja7m2kkcf9h335pvlxms23ls539i81nf6xd6yvd78"; + url = https://github.com/dorimanx/exfat-nofuse/compare/01c30ad52625a7261e1b0d874553b6ca7af25966...f93a47e6414d567a1e7f6ab7f34b015b20f9a050.patch ; + sha256 = "0w57pi9h6dwjxfgc3zpwy6sr4zw42hn1zj72f7wgfpqrx6d8xkh5"; } ) - # fix compile-errors in 4.20 - (fetchpatch { - url = https://aur.archlinux.org/cgit/aur.git/plain/4.20.patch?h=exfat-dkms-git; - sha256 = "05l5x5yvd4vlvnr1bjl751gzcylvm3g9551fqdx7lqphhyiyv3bc"; - }) ]; meta = {