summary refs log tree commit diff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2017-12-10 01:37:34 -0500
committerWill Dietz <w@wdtz.org>2018-01-24 09:33:34 -0600
commitb62864adf47d06897caff6f9e7b485febc814257 (patch)
tree1d3c40feadd4f19cdd844cecc34ad14c34926f52
parentf4348cc5cbb598d9779a3660e2c2f232ed1278b2 (diff)
downloadnixlib-b62864adf47d06897caff6f9e7b485febc814257.tar
nixlib-b62864adf47d06897caff6f9e7b485febc814257.tar.gz
nixlib-b62864adf47d06897caff6f9e7b485febc814257.tar.bz2
nixlib-b62864adf47d06897caff6f9e7b485febc814257.tar.lz
nixlib-b62864adf47d06897caff6f9e7b485febc814257.tar.xz
nixlib-b62864adf47d06897caff6f9e7b485febc814257.tar.zst
nixlib-b62864adf47d06897caff6f9e7b485febc814257.zip
e2fsprogs: Enable cross-compilation
-rw-r--r--pkgs/tools/filesystems/e2fsprogs/default.nix10
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index e6a83e32632c..a27eb5094dba 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libuuid, gettext, texinfo }:
+{ stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "e2fsprogs-1.43.8";
@@ -10,15 +10,9 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "man" "info" ];
 
-  nativeBuildInputs = [ pkgconfig texinfo ];
+  nativeBuildInputs = [ pkgconfig texinfo buildPackages.stdenv.cc ];
   buildInputs = [ libuuid ] ++ stdenv.lib.optional (!stdenv.isLinux) gettext;
 
-  crossAttrs = {
-    preConfigure = ''
-      export CC=$crossConfig-gcc
-    '';
-  };
-
   configureFlags =
     if stdenv.isLinux then [
       "--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks"