BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #239473 from nikstur/erofs-darwin

Browse source 
erofs-utils: enable running on darwin
This commit is contained in:
Weijia Wang 2023-06-27 15:36:31 +03:00 committed by GitHub
commit b1a839f1cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/os-specific/linux/erofs-utils/default.nix → pkgs/tools/filesystems/erofs-utils/default.nix
View file

@ -1,4 +1,6 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, libuuid, lz4 }:
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4
, fuseSupport ? stdenv.isLinux
}:
stdenv.mkDerivation rec {
pname = "erofs-utils";
@ -12,14 +14,15 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ fuse libuuid lz4 ];
buildInputs = [ util-linux lz4 ]
++ lib.optionals fuseSupport [ fuse ];
configureFlags = [ "--enable-fuse" ];
configureFlags = lib.optionals fuseSupport [ "--enable-fuse" ];
meta = with lib; {
description = "Userspace utilities for linux-erofs file system";
license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ ehmry ];
platforms = platforms.linux;
maintainers = with maintainers; [ ehmry nikstur ];
platforms = platforms.unix;
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -7203,6 +7203,8 @@ with pkgs;
ecmtools = callPackage ../tools/cd-dvd/ecm-tools { };
erofs-utils = callPackage ../tools/filesystems/erofs-utils { };
e2tools = callPackage ../tools/filesystems/e2tools { };
e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { };
@ -27065,8 +27067,6 @@ with pkgs;
dstat = callPackage ../os-specific/linux/dstat { };
erofs-utils = callPackage ../os-specific/linux/erofs-utils { };
evdev-proto = callPackage ../os-specific/bsd/freebsd/evdev-proto { };
fscryptctl = callPackage ../os-specific/linux/fscryptctl { };