summary refs log tree commit diff
path: root/pkgs/tools/filesystems
diff options
context:
space:
mode:
authorRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2018-08-31 17:32:48 +0200
committerRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2018-08-31 17:32:48 +0200
commit93550cbddfeacd4902bebbfaab2c9c3d337f5650 (patch)
treedf3259694e2c0ab3ae79449601880ce68e365f7e /pkgs/tools/filesystems
parenta9780a095bd05c5104c643f927a680194d040a92 (diff)
parentdde959a8965af69e19a4bf7b246095a97dc3dbc8 (diff)
downloadnixpkgs-93550cbddfeacd4902bebbfaab2c9c3d337f5650.tar
nixpkgs-93550cbddfeacd4902bebbfaab2c9c3d337f5650.tar.gz
nixpkgs-93550cbddfeacd4902bebbfaab2c9c3d337f5650.tar.bz2
nixpkgs-93550cbddfeacd4902bebbfaab2c9c3d337f5650.tar.lz
nixpkgs-93550cbddfeacd4902bebbfaab2c9c3d337f5650.tar.xz
nixpkgs-93550cbddfeacd4902bebbfaab2c9c3d337f5650.tar.zst
nixpkgs-93550cbddfeacd4902bebbfaab2c9c3d337f5650.zip
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r--pkgs/tools/filesystems/sshfs-fuse/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index 183cfb2ddbe..ddec6b7eff8 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   checkInputs = [ which python3Packages.pytest ];
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optional
-    (stdenv.system == "i686-linux")
+    (stdenv.hostPlatform.system == "i686-linux")
     "-D_FILE_OFFSET_BITS=64";
 
   postInstall = ''