archivemount: 1 -> 1a (#367253)
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromSourcehut,
|
||||
fetchpatch,
|
||||
pkg-config,
|
||||
fuse,
|
||||
libarchive,
|
||||
@@ -10,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "archivemount";
|
||||
version = "1";
|
||||
version = "1a";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~nabijaczleweli";
|
||||
repo = "archivemount-ng";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-xuLtbqC9iS86BKz4jG8of4id+GTlBXoohONrkmIzOpY=";
|
||||
hash = "sha256-XfWs8+vYCa9G9aPtXk/s5YYq/CHNOS7XDrGW7WpSWBQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@@ -32,16 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
# Fix missing standard struct stat on Darwin
|
||||
# Already on upstream, but no new release made
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-missing-standard-struct-stat-on-darwin.patch";
|
||||
url = "https://git.sr.ht/~nabijaczleweli/archivemount-ng/commit/53dd70f05fdb6ababe7c1ca70f0f62bcf4930b5a.patch";
|
||||
hash = "sha256-UqoALAJoNXihop6Mem4mu+W8REOV92Zyv7pPW20Ugz8=";
|
||||
})
|
||||
];
|
||||
|
||||
# Fix cross-compilation
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace-fail pkg-config "$PKG_CONFIG"
|
||||
@@ -49,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives";
|
||||
changelog = "https://git.sr.ht/~nabijaczleweli/archivemount-ng/refs/${finalAttrs.version}";
|
||||
mainProgram = "archivemount";
|
||||
license = [
|
||||
lib.licenses.lgpl2Plus
|
||||
|
||||
Reference in New Issue
Block a user