3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #68674 from JohnAZoidberg/xfstests-sep-2019

xfstests: 2018-04-11 -> 2019-09-08
This commit is contained in:
WilliButz 2019-09-13 18:12:10 +02:00 committed by GitHub
commit e64239dca3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -4,12 +4,12 @@
, time, utillinux, which, writeScript, xfsprogs, runtimeShell }:
stdenv.mkDerivation {
name = "xfstests-2018-04-11";
name = "xfstests-2019-09-08";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git";
rev = "fdf6d4bc862bb3269c95986fdaf1c59271762ad6";
sha256 = "16j1kcmj0xq6s2qw4hll5r5cz7q4vbbsy2nh1g5aaq7xsl3h8mhb";
rev = "0837e907988a5f410cae0ae714f42f9c4242e072";
sha256 = "1f5cv0vwc1g9difzp69k49rc5nfd08y72vdg318j25nv3rwv7wc9";
};
nativeBuildInputs = [
@ -23,6 +23,9 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
patchPhase = ''
substituteInPlace Makefile \
--replace "cp include/install-sh ." "cp -f include/install-sh ."
# Patch the destination directory
sed -i include/builddefs.in -e "s|^PKG_LIB_DIR\s*=.*|PKG_LIB_DIR=$out/lib/xfstests|"