Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2 files changed, 44 insertions, 2 deletions

diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix
new file mode 100644
index 000000000000..8e4838536725
--- /dev/null
+++ b/pkgs/tools/filesystems/securefs/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub
+, fuse }:
+
+stdenv.mkDerivation rec {
+  name = "securefs-${version}";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    sha256 = "1n9kgrvc600lfclrk8cj2zy8md1brqhs8kvzdwfxgxavdh0wakkc";
+    rev = version;
+    repo = "securefs";
+    owner = "netheril96";
+  };
+
+  buildInputs = [ fuse ];
+
+  enableParallelBuilding = true;
+
+  doCheck = false; # tests require the fuse module to be loaded
+
+  installPhase = ''
+    install -D -m0755 {.,$out/bin}/securefs
+  '';
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Transparent encryption filesystem";
+    longDescription = ''
+      Securefs is a filesystem in userspace (FUSE) that transparently encrypts
+      and authenticates data stored. It is particularly designed to secure
+      data stored in the cloud.
+      Securefs mounts a regular directory onto a mount point. The mount point
+      appears as a regular filesystem, where one can read/write/create files,
+      directories and symbolic links. The underlying directory will be
+      automatically updated to contain the encrypted and authenticated
+      contents.
+    '';
+    license = with licenses; [ bsd2 mit ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 966b3df8b175..1658a4289201 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -5,12 +5,12 @@ assert stdenv.isLinux;
 let
   p = if stdenv.is64bit then {
       arch = "x86_64";
-      gcclib = "${stdenv.cc.cc}/lib64";
+      gcclib = "${stdenv.cc.cc.lib}/lib64";
       sha256 = "0k05ybvnv0zx4vfx55jyhia38qqysaj68mapq0gwgf74k3a943g2";
     }
     else {
       arch = "i386";
-      gcclib = "${stdenv.cc.cc}/lib";
+      gcclib = "${stdenv.cc.cc.lib}/lib";
       sha256 = "09z9idmp7idcq0alwkla9kal9h82dx11jqh678lc4rviqggxzxhp";
     };
 in