alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

pciutils, ntfs3g: don't pull in kmod on darwin

Browse source 
`kmod` is a linux-only package. Previous versions worked on `darwin`
by chance and might break in the future. Remove `kmod` import from
there.

Co-authored-by: Artturi <Artturin@artturin.com>
This commit is contained in:
Sergei Trofimovich 2022-07-24 17:37:55 +01:00
parent ff56c775c8
commit ab4d64dd74
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/tools/filesystems/ntfs-3g/default.nix
View file

@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
"--enable-extras"
"--with-mount-helper=${mount}/bin/mount"
"--with-umount-helper=${mount}/bin/umount"
] ++ lib.optionals stdenv.isLinux [
"--with-modprobe-helper=${kmod}/bin/modprobe"
];

7
pkgs/tools/system/pciutils/default.nix
View file

@ -14,10 +14,11 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib kmod which ] ++
lib.optional stdenv.hostPlatform.isDarwin IOKit;
buildInputs = [ which zlib ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]
++ lib.optionals stdenv.hostPlatform.isLinux [ kmod ];
preConfigure = if stdenv.cc.isGNU then null else ''
preConfigure = lib.optionalString (!stdenv.cc.isGNU) ''
substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' ""
'';