public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfsprogs: fix cross compilation

This commit is contained in:
eburimu 2018-11-28 12:44:42 +03:00 committed by John Ericson
parent dc8aca448d
commit 0b695faa07
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/filesystems/xfsprogs/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchpatch, fetchgit, autoconf, automake, gettext, libtool, readline, utillinux }:
{ stdenv, fetchpatch, fetchgit, autoconf, automake, gettext, libtool, readline
, buildPackages, libuuid
}:
let
gentooPatch = name: sha256: fetchpatch {
@ -19,8 +21,12 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "doc" ];
nativeBuildInputs = [ autoconf automake libtool gettext ];
propagatedBuildInputs = [ utillinux ]; # Dev headers include <uuid/uuid.h>
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [
autoconf automake libtool gettext
libuuid # codegen tool uses libuuid
];
propagatedBuildInputs = [ libuuid ]; # Dev headers include <uuid/uuid.h>
buildInputs = [ readline ];
enableParallelBuilding = true;

2
pkgs/top-level/all-packages.nix
View File

@ -6303,7 +6303,7 @@ with pkgs;
gnome_python = gnome2.gnome_python;
};
xfsprogs = callPackage ../tools/filesystems/xfsprogs { utillinux = utillinuxMinimal; };
xfsprogs = callPackage ../tools/filesystems/xfsprogs { };
libxfs = xfsprogs.dev;
xml2 = callPackage ../tools/text/xml/xml2 { };