diff options
Diffstat (limited to 'pkgs/tools/filesystems')
29 files changed, 55 insertions, 55 deletions
diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix index af4e20ac55ee2..c56a4b189e152 100644 --- a/pkgs/tools/filesystems/aefs/default.nix +++ b/pkgs/tools/filesystems/aefs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { # # $ tar xf "$(nix-build -A aefs.src)" # $ grep -R FUSE_USE_VERSION - configureFlags = lib.optional stdenv.isDarwin "CPPFLAGS=-DFUSE_USE_VERSION=26"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "CPPFLAGS=-DFUSE_USE_VERSION=26"; nativeBuildInputs = [ autoreconfHook git ]; @@ -37,6 +37,6 @@ stdenv.mkDerivation { maintainers = [ ]; license = licenses.gpl2Plus; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index b5fe1a4e85eae..78d60b90b3955 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake readline pkg-config wrapQtAppsHook ]; buildInputs = [ fuse qtbase qttools ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/*.app $out/Applications ''; diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/tools/filesystems/apfs-fuse/default.nix index 5881d361c5495..88b2c5d3e6240 100644 --- a/pkgs/tools/filesystems/apfs-fuse/default.nix +++ b/pkgs/tools/filesystems/apfs-fuse/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace "/usr/local/lib/libosxfuse.dylib" "fuse" ''; @@ -20,14 +20,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ - (if stdenv.isDarwin then fuse else fuse3) + (if stdenv.hostPlatform.isDarwin then fuse else fuse3) bzip2 zlib - ] ++ lib.optional stdenv.isLinux attr; + ] ++ lib.optional stdenv.hostPlatform.isLinux attr; - cmakeFlags = lib.optional stdenv.isDarwin "-DUSE_FUSE3=OFF"; + cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DUSE_FUSE3=OFF"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DUSE_FUSE2"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DUSE_FUSE2"; postFixup = '' ln -s $out/bin/apfs-fuse $out/bin/mount.fuse.apfs-fuse diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index a8013bd8600b6..f086e9416ad6e 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = if stdenv.isDarwin then [ fuse ] else [ fuse3 ]; + buildInputs = if stdenv.hostPlatform.isDarwin then [ fuse ] else [ fuse3 ]; - configureFlags = lib.optional stdenv.isDarwin "--disable-macos-fs-link"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--disable-macos-fs-link"; postFixup = '' ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index 04106ee68b314..b12966541c997 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation { buildFlags = [ "static" "CC=${stdenv.cc.targetPrefix}cc" - ] ++ lib.optional stdenv.isDarwin "CFLAGS=-D_BSD_SOURCE"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "CFLAGS=-D_BSD_SOURCE"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index e4f0bae9b27b9..e5beaf3841dfc 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -382,7 +382,7 @@ in rec { utf8proc zlib zstd - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ keyutils libcap_ng liburing @@ -457,7 +457,7 @@ in rec { "-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF" # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}'' - ] ++ lib.optional stdenv.isLinux "-DWITH_SYSTEM_LIBURING=ON"; + ] ++ lib.optional stdenv.hostPlatform.isLinux "-DWITH_SYSTEM_LIBURING=ON"; preBuild = # The legacy-option-headers target is not correctly empbedded in the build graph. diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix index 8583cce73daef..4da68dfb751bb 100644 --- a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix +++ b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ] @@ -107,7 +107,7 @@ buildPythonPackage rec { # save compute time by not running benchmarks "tests/bench" ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # aarch64-darwin forbids W+X memory, but this tests depends on it: # * https://cffi.readthedocs.io/en/latest/using.html#callbacks "tests/hazmat/backends/test_openssl_memleak.py" diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 588dcb320aa5b..52444e56cb05c 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; # ++ lib.optional doCheck "-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake"; # macFUSE needs to be installed for the test to succeed on Darwin - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index 7b3760ba5aa2e..06a86a74b523d 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse curl glib zlib ]; - CFLAGS = lib.optionalString stdenv.isDarwin "-D__off_t=off_t"; + CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D__off_t=off_t"; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix the build on macOS with macFUSE installed. Needs autoreconfHook for # this change to effect substituteInPlace configure.ac --replace \ diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index eda54d341f9a7..0305e65146404 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; # configure.ac:75: error: required file './config.rpath' not found # https://github.com/dosfstools/dosfstools/blob/master/autogen.sh diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index b8443e8ac8800..4d0849b896d09 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, fetchurl, fetchpatch, pkg-config, libuuid, gettext, texinfo -, withFuse ? stdenv.isLinux, fuse3 +, withFuse ? stdenv.hostPlatform.isLinux, fuse3 , shared ? !stdenv.hostPlatform.isStatic , e2fsprogs, runCommand }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; configureFlags = - if stdenv.isLinux then [ + if stdenv.hostPlatform.isLinux then [ # It seems that the e2fsprogs is one of the few packages that cannot be # build with shared and static libs. (if shared then "--enable-elf-shlibs" else "--disable-elf-shlibs") diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index 3946523ccb10d..93e6fd18f9844 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -10,7 +10,7 @@ xz, zlib, libselinux, - fuseSupport ? stdenv.isLinux, + fuseSupport ? stdenv.hostPlatform.isLinux, selinuxSupport ? false, lzmaSupport ? false, }: diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index ebdedd5b4aa34..04430fc23ee41 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { done ''; - buildInputs = lib.optionals stdenv.isLinux [ systemd parted ] - ++ lib.optionals stdenv.isDarwin [ argp-standalone ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemd parted ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ argp-standalone ]; buildFlags = [ "all" # f3read, f3write ] - ++ lib.optional stdenv.isLinux "extra"; # f3brew, f3fix, f3probe + ++ lib.optional stdenv.hostPlatform.isLinux "extra"; # f3brew, f3fix, f3probe installFlags = [ "PREFIX=${placeholder "out"}" @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" ] - ++ lib.optional stdenv.isLinux "install-extra"; + ++ lib.optional stdenv.hostPlatform.isLinux "install-extra"; postInstall = '' install -Dm555 -t $out/bin f3write.h2w log-f3wr diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/pkgs/tools/filesystems/file-rename/default.nix index 8bc7a899cd3ba..e2e1eccae216b 100644 --- a/pkgs/tools/filesystems/file-rename/default.nix +++ b/pkgs/tools/filesystems/file-rename/default.nix @@ -20,7 +20,7 @@ perlPackages.buildPerlPackage { --replace "#!${perl}/bin/perl" "#!${perl}/bin/perl -I $out/${perl.libPrefix}" ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Perl extension for renaming multiple files"; diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 2430536656dc4..34f9da67ae649 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -35,7 +35,7 @@ let buildInputs = [ openssl - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; checkInputs = [ cacert @@ -99,7 +99,7 @@ rec { hash = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc="; cargoHash = "sha256-1cGlJP/RRgxt3GGMN1c+7Y5lLHJyvHEnpLsR35R5FfI="; cargoPatches = [ ./update-time-0.8.patch ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; garage_0_9_4 = generic { @@ -107,14 +107,14 @@ rec { hash = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk="; cargoHash = "sha256-1Hrip4R5dr31czOcFMGW4ZvVfVwvdd7LkwukwNpS3o4="; cargoPatches = [ ./update-time.patch ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; garage_1_0_1 = generic { version = "1.0.1"; hash = "sha256-f6N2asycN04I6U5XQ5LEAqYu/v5jYZiFCxZ8YQ32XyM="; cargoHash = "sha256-jpc/vaygC5WNSkVA3P01mCRk9Nx/CUumE893tHWoe34="; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; garage_0_8 = garage_0_8_7; diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index 8de22d3efcdf8..3e6ae58049bda 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://git.pengutronix.de/cgit/genimage"; description = "Generate filesystem images from directory trees"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 4a1341dce7b0b..26655053574e5 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { homepage = "https://github.com/hanwen/go-mtpfs"; license = licenses.bsd3; maintainers = [ ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "go-mtpfs"; }; } diff --git a/pkgs/tools/filesystems/goofys/default.nix b/pkgs/tools/filesystems/goofys/default.nix index c8840e0fd3bc8..06039d529d56b 100644 --- a/pkgs/tools/filesystems/goofys/default.nix +++ b/pkgs/tools/filesystems/goofys/default.nix @@ -30,7 +30,7 @@ buildGoModule { description = "High-performance, POSIX-ish Amazon S3 file system written in Go"; license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.adisbladis ]; - broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 + broken = stdenv.hostPlatform.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 mainProgram = "goofys"; }; diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 4f5524d6734c2..51066544749b2 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -28,15 +28,15 @@ stdenv.mkDerivation rec { strictDeps = true; - buildFlags = lib.optionals stdenv.isDarwin [ "CPPFLAGS=-UHAVE_STRUCT_STAT_ST_BIRTHTIME" ]; + buildFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CPPFLAGS=-UHAVE_STRUCT_STAT_ST_BIRTHTIME" ]; # Fix the build on macOS with macFUSE installed - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace \ "/usr/local/lib/pkgconfig" "/nonexistent" ''; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config.h --replace \ "#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1" \ "#undef HAVE_STRUCT_STAT_ST_BIRTHTIME" diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index ef5eafc405081..3e2c75aeb0926 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { hash = "sha256-N9xN8CJTPD1LLsHHiXPCfH6LWFN0wtRqtkxqPbMe3bg="; }; - patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; + patches = lib.optional stdenv.hostPlatform.isDarwin ./UNUSED-darwin.patch; # fails to find X on darwin - configureFlags = lib.optional stdenv.isDarwin "--without-x"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--without-x"; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; doCheck = true; diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index d84f9cc9b9b13..a0ca5e5a82aa0 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { platforms = platforms.all; license = licenses.gpl3; maintainers = [ maintainers.qknight ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/mtpfs.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/mtpfs.x86_64-darwin mainProgram = "mtpfs"; }; } diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 56d6bdc7fba2e..5a9426cee486c 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext libuuid ] ++ lib.optionals crypto [ gnutls libgcrypt ] - ++ lib.optionals stdenv.isDarwin [ macfuse-stubs DiskArbitration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ macfuse-stubs DiskArbitration ]; # Note: libgcrypt is listed here non-optionally because its m4 macros are # being used in ntfs-3g's configure.ac. @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "--enable-extras" "--with-mount-helper=${mount}/bin/mount" "--with-umount-helper=${mount}/bin/umount" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--with-modprobe-helper=${kmod}/bin/modprobe" ]; diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index 83353394e0090..e964f944d3a88 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { VERSION = version; - doCheck = !(stdenv.isDarwin && stdenv.isx86_64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); nativeBuildInputs = [ autoreconfHook @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; # SMART is only supported on Linux and requires the smartmontools package - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/snapraid \ --prefix PATH : ${lib.makeBinPath [ smartmontools ]} ''; diff --git a/pkgs/tools/filesystems/sshfs-fuse/common.nix b/pkgs/tools/filesystems/sshfs-fuse/common.nix index 932c7693dc88f..3654c77cc4b86 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/common.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/common.nix @@ -8,7 +8,7 @@ }: let - fuse = if stdenv.isDarwin then macfuse-stubs else fuse3; + fuse = if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse3; in stdenv.mkDerivation rec { pname = "sshfs-fuse"; inherit version; @@ -33,12 +33,12 @@ in stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/sbin ln -sf $out/bin/sshfs $out/sbin/mount.sshfs - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' wrapProgram $out/bin/sshfs --prefix PATH : "${openssh}/bin" ''; # doCheck = true; - checkPhase = lib.optionalString (!stdenv.isDarwin) '' + checkPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # The tests need fusermount: mkdir bin cp ${fuse}/bin/fusermount3 bin/fusermount diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 2f11bb0047adf..bc836ac3abada 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, callPackage, fetchpatch }: let mkSSHFS = args: callPackage (import ./common.nix args) { }; -in if stdenv.isDarwin then +in if stdenv.hostPlatform.isDarwin then mkSSHFS { version = "2.10"; # macFUSE isn't yet compatible with libfuse 3.x sha256 = "1dmw4kx6vyawcywiv8drrajnam0m29mxfswcp4209qafzx3mjlp1"; diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index 8aa66de8da3fd..2f0e32799d800 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # # $ tar xf "$(nix-build -A svnfs.src)" # $ grep -R FUSE_USE_VERSION - configureFlags = lib.optionals stdenv.isDarwin [ "CFLAGS=-DFUSE_USE_VERSION=25" ]; + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CFLAGS=-DFUSE_USE_VERSION=25" ]; # why is this required? preConfigure='' diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index 4dc9ca9de6e6f..2518cfb24ba30 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ./prevent-kill-on-shutdown.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace '/usr/local/include/osxfuse/fuse' '${fuse}/include/fuse' ''; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # # This must be done in preConfigure because the build process removes # helper from the source directory during the build. - preConfigure = lib.optionalString (!stdenv.isDarwin) '' + preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p $out/sbin cp -a mount.unionfs $out/sbin/mount.unionfs-fuse substituteInPlace $out/sbin/mount.unionfs-fuse --replace mount.fuse ${fuse}/sbin/mount.fuse @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "FUSE UnionFS implementation"; homepage = "https://github.com/rpodgorny/unionfs-fuse"; license = licenses.bsd3; diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index 3f8897c091bc8..9c1b68cc63072 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [fuse glib neon]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix the build on macOS with macFUSE installed. Needs autoreconfHook to # take effect. substituteInPlace configure.ac --replace \ diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index ad3c44faf6165..6e7a19ad8ee87 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, zlib, rpmextract, patchelf, which }: let - p = if stdenv.is64bit then { + p = if stdenv.hostPlatform.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc.lib}/lib64"; sha256 = "sha256-HH/pLZmDr6m/B3e6MHafDGnNWR83oR2y1ijVMR/LOF0="; |