diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 21:45:37 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-17 23:26:08 +0700 |
commit | 16d91ee628d781c721506b19e3e03bed810327e8 (patch) | |
tree | f65e50a70b4ff72314f384c6b29f4902b03f45f3 /pkgs/os-specific/linux/fuse/common.nix | |
parent | 979e6e67d32a934dcc39dedfd588baf6e3f7ed78 (diff) | |
download | nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar.gz nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar.bz2 nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar.lz nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar.xz nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.tar.zst nixpkgs-16d91ee628d781c721506b19e3e03bed810327e8.zip |
pkgs/os-specific: stdenv.lib -> lib
Diffstat (limited to 'pkgs/os-specific/linux/fuse/common.nix')
-rw-r--r-- | pkgs/os-specific/linux/fuse/common.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index faef3673bb9..053ea34c82e 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -8,7 +8,7 @@ }: let - isFuse3 = stdenv.lib.hasPrefix "3" version; + isFuse3 = lib.hasPrefix "3" version; in stdenv.mkDerivation rec { pname = "fuse"; inherit version; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { preAutoreconf = "touch config.rpath"; patches = - stdenv.lib.optional + lib.optional (!isFuse3 && stdenv.isAarch64) (fetchpatch { url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; @@ -37,9 +37,9 @@ in stdenv.mkDerivation rec { then [ meson ninja pkg-config ] else [ autoreconfHook gettext ]; - outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common"; + outputs = [ "out" ] ++ lib.optional isFuse3 "common"; - mesonFlags = stdenv.lib.optionals isFuse3 [ + mesonFlags = lib.optionals isFuse3 [ "-Dudevrulesdir=/udev/rules.d" "-Duseroot=false" ]; |