Merge branch 'staging-next' into staging

Resolved the following conflicts: - kernel flags between 09176d28a0 and 2b28822d8d - clojure-lsp between 3fa00685ce and e03c068af5
2021-02-19 17:15:31 +01:00
parent c34b032ccb e4f96ad7d9
commit 8f50f1ce10
62 changed files with 454 additions and 163 deletions
@@ -11,10 +11,6 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ pkg-config autoconf ];
  buildInputs = [ fuse samba glib attr libsecret ];

-  postPatch = ''
-    substituteInPlace src/function.c --replace "attr/xattr.h" "sys/xattr.h"
-  '';
-
  meta = with lib; {
    description = "A FUSE FS for mounting Samba shares";
    maintainers = with maintainers; [ raskin ];