tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

xfsprogs: fix cross compilation

authored by

eburimu and committed by
John Ericson 0b695faa dc8aca44

+10 -4
unified split
+9 -3
pkgs/tools/filesystems/xfsprogs/default.nix
··· 1 - { stdenv, fetchpatch, fetchgit, autoconf, automake, gettext, libtool, readline, utillinux }: 2 3 let 4 gentooPatch = name: sha256: fetchpatch { ··· 19 20 outputs = [ "bin" "dev" "out" "doc" ]; 21 22 - nativeBuildInputs = [ autoconf automake libtool gettext ]; 23 - propagatedBuildInputs = [ utillinux ]; # Dev headers include <uuid/uuid.h> 24 buildInputs = [ readline ]; 25 26 enableParallelBuilding = true;
··· 1 + { stdenv, fetchpatch, fetchgit, autoconf, automake, gettext, libtool, readline 2 + , buildPackages, libuuid 3 + }: 4 5 let 6 gentooPatch = name: sha256: fetchpatch { ··· 21 22 outputs = [ "bin" "dev" "out" "doc" ]; 23 24 + depsBuildBuild = [ buildPackages.stdenv.cc ]; 25 + nativeBuildInputs = [ 26 + autoconf automake libtool gettext 27 + libuuid # codegen tool uses libuuid 28 + ]; 29 + propagatedBuildInputs = [ libuuid ]; # Dev headers include <uuid/uuid.h> 30 buildInputs = [ readline ]; 31 32 enableParallelBuilding = true;
+1 -1
pkgs/top-level/all-packages.nix
··· 6303 gnome_python = gnome2.gnome_python; 6304 }; 6305 6306 - xfsprogs = callPackage ../tools/filesystems/xfsprogs { utillinux = utillinuxMinimal; }; 6307 libxfs = xfsprogs.dev; 6308 6309 xml2 = callPackage ../tools/text/xml/xml2 { };
··· 6303 gnome_python = gnome2.gnome_python; 6304 }; 6305 6306 + xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; 6307 libxfs = xfsprogs.dev; 6308 6309 xml2 = callPackage ../tools/text/xml/xml2 { };