Merge pull request #38895 from Mic92/mergerfs
mergerfs: 2.24.0 -> 2.24.2
This commit is contained in:
commit
1cbbe204cc
@ -1,21 +1,28 @@
|
|||||||
{ stdenv, fetchgit, autoconf, automake, pkgconfig, gettext, libtool, git, pandoc, which, attr, libiconv }:
|
{ stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "mergerfs-${version}";
|
name = "mergerfs-${version}";
|
||||||
version = "2.24.0";
|
version = "2.24.2";
|
||||||
|
|
||||||
# not using fetchFromGitHub because of changelog being built with git log
|
src = fetchFromGitHub {
|
||||||
src = fetchgit {
|
owner = "trapexit";
|
||||||
url = "https://github.com/trapexit/mergerfs";
|
repo = "mergerfs";
|
||||||
rev = "refs/tags/${version}";
|
rev = version;
|
||||||
sha256 = "12ci1i5zkarl1rz0pq1ldw0fpp4yfj8vz36jij63am7w7gp7qly2";
|
sha256 = "0i65v7900s7c9jkj3a4v44vf3r5mvjkbcic3df940nmk0clahhcs";
|
||||||
deepClone = true;
|
|
||||||
leaveDotGit = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoconf automake pkgconfig gettext libtool git pandoc which ];
|
nativeBuildInputs = [
|
||||||
|
automake autoconf pkgconfig gettext libtool pandoc which
|
||||||
|
];
|
||||||
buildInputs = [ attr libiconv ];
|
buildInputs = [ attr libiconv ];
|
||||||
|
|
||||||
|
preConfigure = ''
|
||||||
|
cat > src/version.hpp <<EOF
|
||||||
|
#pragma once
|
||||||
|
static const char MERGERFS_VERSION[] = "${version}";
|
||||||
|
EOF
|
||||||
|
'';
|
||||||
|
|
||||||
makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ];
|
makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user