Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ed71691a810d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 071eba26a486
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 29, 2018

  1. f2fs-tools: fix cross compilation

    @eburimu
    eburimu committed Nov 29, 2018
    Copy the full SHA
    d8e7325 View commit details

  2. Merge pull request #51204 from eburimu/fix/cross-f2fs-tools 

    f2fs-tools: fix cross compilation
    @Ericson2314
    Ericson2314 authored Nov 29, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    071eba2 View commit details
Showing with 29 additions and 0 deletions.
  1. +2 −0 pkgs/tools/filesystems/f2fs-tools/default.nix
  2. +27 −0 pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
2 changes: 2 additions & 0 deletions pkgs/tools/filesystems/f2fs-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
27 changes: 27 additions & 0 deletions pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
View file
Original file line number Diff line number Diff line change
@@ -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])