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

Merge pull request #51170 from eburimu/fix/cross-xfsprogs

Browse Source 
xfsprogs: fix cross compilation
This commit is contained in:
John Ericson 2018-12-02 14:59:01 -05:00 committed by GitHub
commit 7beb1adcf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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, pkgconfig, icu }: { stdenv, buildPackages, fetchpatch, fetchgit, autoconf, automake, gettext, libtool, pkgconfig
, icu, libuuid, readline
}:
let let
gentooPatch = name: sha256: fetchpatch { gentooPatch = name: sha256: fetchpatch {
@ -19,9 +21,13 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "doc" ]; outputs = [ "bin" "dev" "out" "doc" ];
nativeBuildInputs = [ autoconf automake libtool gettext pkgconfig ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
propagatedBuildInputs = [ utillinux ]; # Dev headers include <uuid/uuid.h> nativeBuildInputs = [
autoconf automake libtool gettext pkgconfig
libuuid # codegen tool uses libuuid
];
buildInputs = [ readline icu ]; buildInputs = [ readline icu ];
propagatedBuildInputs = [ libuuid ]; # Dev headers include <uuid/uuid.h>
enableParallelBuilding = true; enableParallelBuilding = true;

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

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