summary refs log tree commit diff
diff options
context:
space:
mode:
authorK900 <me@0upti.me>2023-06-01 11:13:04 +0300
committerK900 <me@0upti.me>2023-06-01 11:13:35 +0300
commit01e06549c6db0a7fc54da02d4ed19f63bf1d336d (patch)
tree79ab16f6a6f446f245fba43294d83ac1bdc811f7
parent20b83c6e5071a6a320d57de511fbaaeaaa1f8c27 (diff)
downloadnixpkgs-01e06549c6db0a7fc54da02d4ed19f63bf1d336d.tar
nixpkgs-01e06549c6db0a7fc54da02d4ed19f63bf1d336d.tar.gz
nixpkgs-01e06549c6db0a7fc54da02d4ed19f63bf1d336d.tar.bz2
nixpkgs-01e06549c6db0a7fc54da02d4ed19f63bf1d336d.tar.lz
nixpkgs-01e06549c6db0a7fc54da02d4ed19f63bf1d336d.tar.xz
nixpkgs-01e06549c6db0a7fc54da02d4ed19f63bf1d336d.tar.zst
nixpkgs-01e06549c6db0a7fc54da02d4ed19f63bf1d336d.zip
util-linux: backport patches fixing mount on older kernels
-rw-r--r--pkgs/os-specific/linux/util-linux/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 3b8d5f53e78..7b98c6bcd9d 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, zlib, shadow
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, zlib, shadow
 , capabilitiesSupport ? stdenv.isLinux
 , libcap_ng
 , libxcrypt
@@ -28,6 +28,16 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./rtcwake-search-PATH-for-shutdown.patch
+
+    # FIXME: backport mount fixes for older kernels, remove in next release
+    (fetchpatch {
+      url = "https://github.com/util-linux/util-linux/commit/f94a7760ed7ce81389a6059f020238981627a70d.diff";
+      hash = "sha256-UorqDeECK8pBePkmpo2x90p/jP3rCMshyPCyijSX1wo=";
+    })
+    (fetchpatch {
+      url = "https://github.com/util-linux/util-linux/commit/1bd85b64632280d6bf0e86b4ff29da8b19321c5f.diff";
+      hash = "sha256-dgu4de5ul/si7Vzwe8lr9NvsdI1CWfDQKuqvARaY6sE=";
+    })
   ];
 
   outputs = [ "bin" "dev" "out" "lib" "man" ];