Unverified Commit 1f9a3b53 authored by Arne Keller's avatar Arne Keller Committed by GitHub
Browse files

fuse3: avoid infinite recursion, don't build examples (#417899)

parents 91d1a958 eeee1ff9

pkgs/os-specific/linux/fuse/common.nix

+12 −6
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ stdenv.mkDerivation rec { 
        meson

        ninja

        pkg-config

        udevCheckHook

      ]

      ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ udevCheckHook ] # inf rec on musl, so skip

    else

      [

        autoreconfHook
@@ -76,11 +76,17 @@ stdenv.mkDerivation rec { 
    "man"

  ] ++ lib.optional isFuse3 "udev";



  mesonFlags = lib.optionals isFuse3 [

  mesonFlags = lib.optionals isFuse3 (

    [

      "-Dudevrulesdir=/udev/rules.d"

      "-Duseroot=false"

      "-Dinitscriptdir="

  ];

    ]

    # examples fail to build on musl

    # error: ‘RENAME_NOREPLACE’ was not declared in this scope

    # lib.optionals instead of lib.mesonBool to avoid rebuilds

    ++ lib.optionals (stdenv.hostPlatform.isMusl) [ "-Dexamples=false" ]

  );



  # Ensure that FUSE calls the setuid wrapper, not

  # $out/bin/fusermount. It falls back to calling fusermount in