diff options
author | John Ericson <git@JohnEricson.me> | 2018-11-29 15:26:27 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-29 15:26:27 -0500 |
commit | 071eba26a486e1b86df157a0d5e5d460e740e13a (patch) | |
tree | 0688afd97de36e612853a21104cd95677eb43a12 /pkgs/tools | |
parent | ed71691a810db74ef1d5697246bc3c5c9c707e00 (diff) | |
parent | d8e73253a44f3057d74cedf4d542fcc324dbd500 (diff) | |
download | nixlib-071eba26a486e1b86df157a0d5e5d460e740e13a.tar nixlib-071eba26a486e1b86df157a0d5e5d460e740e13a.tar.gz nixlib-071eba26a486e1b86df157a0d5e5d460e740e13a.tar.bz2 nixlib-071eba26a486e1b86df157a0d5e5d460e740e13a.tar.lz nixlib-071eba26a486e1b86df157a0d5e5d460e740e13a.tar.xz nixlib-071eba26a486e1b86df157a0d5e5d460e740e13a.tar.zst nixlib-071eba26a486e1b86df157a0d5e5d460e740e13a.zip |
Merge pull request #51204 from eburimu/fix/cross-f2fs-tools
f2fs-tools: fix cross compilation
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/filesystems/f2fs-tools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch | 27 |
2 files changed, 29 insertions, 0 deletions
diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index a1428a257742..90bb443dfdd2 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libselinux libuuid ]; + patches = [ ./f2fs-tools-cross-fix.patch ]; + meta = with stdenv.lib; { homepage = http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/; description = "Userland tools for the f2fs filesystem"; diff --git a/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch b/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch new file mode 100644 index 000000000000..1503732240c3 --- /dev/null +++ b/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch @@ -0,0 +1,27 @@ +--- f2fs-tools/configure.ac.orig 2018-11-29 05:05:57.154988687 +0300 ++++ f2fs-tools/configure.ac 2018-11-29 05:06:12.667316101 +0300 +@@ -20,14 +20,16 @@ + [\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]), + [Minor version for f2fs-tools]) + +-AC_CHECK_FILE(.git, +- AC_DEFINE([F2FS_TOOLS_DATE], +- "m4_bpatsubst(f2fs_tools_gitdate, +- [\([0-9-]*\)\(\w\|\W\)*], [\1])", +- [f2fs-tools date based on Git commits]), +- AC_DEFINE([F2FS_TOOLS_DATE], +- "f2fs_tools_date", +- [f2fs-tools date based on Source releases])) ++dnl AC_CHECK_FILE(.git, ++dnl AC_DEFINE([F2FS_TOOLS_DATE], ++dnl "m4_bpatsubst(f2fs_tools_gitdate, ++dnl [\([0-9-]*\)\(\w\|\W\)*], [\1])", ++dnl [f2fs-tools date based on Git commits]), ++dnl AC_DEFINE([F2FS_TOOLS_DATE], ++dnl "f2fs_tools_date", ++dnl [f2fs-tools date based on Source releases])) ++ ++AC_DEFINE([F2FS_TOOLS_DATE], "f2fs_tools_date", [f2fs-tools date based on Source releases]) + + AC_CONFIG_SRCDIR([config.h.in]) + AC_CONFIG_HEADER([config.h]) |