diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-04-05 20:34:08 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-04-05 20:34:08 +0200 |
commit | b4729bad3d1c1c78dbd47634a1efba388c89dbbb (patch) | |
tree | 4ec7677a3559c38d53118bdbf7f797411741546d /pkgs/tools/filesystems | |
parent | 0e141f0382685c8ec32a28b84f6edd274ebd0ae9 (diff) | |
parent | 6427998d85dffc8d3cd724f358ed4af8e4961398 (diff) |
Merge #165406: staging-next 2022-03-23
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r-- | pkgs/tools/filesystems/btrfs-progs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/djmount/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/filesystems/securefs/default.nix | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index c51cc12da36bb..fad1944c4a0eb 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.16.1"; + version = "5.16.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-PaTaU2HPhr3dqA7bTE8w6gdstOvsKZBPoIr8kw754ag="; + sha256 = "sha256-npswOh0P2c6q8gTudMHI+h/VV5TiI9n+K8Yodey9U9I="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix index f5b0a0315dfcb..3111be5b4d12e 100644 --- a/pkgs/tools/filesystems/djmount/default.nix +++ b/pkgs/tools/filesystems/djmount/default.nix @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa"; }; + postPatch = '' + # Taken from https://github.com/pupnp/pupnp/pull/334/files + substituteInPlace libupnp/threadutil/inc/ithread.h \ + --replace \ + "#define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np" \ + '#define ithread_mutexattr_setkind_np pthread_mutexattr_settype' + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse]; diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index 44e547b01c24d..4d56f08b44262 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { ./add-macfuse-support.patch ]; + postPatch = '' + sed -i -e '/TEST_SOURCES/d' CMakeLists.txt + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ fuse ]; |