Skip to content

Commit

Permalink
archivemount: 1 -> 1a (#367253)
Browse files Browse the repository at this point in the history
  • Loading branch information
pbsds authored Jan 5, 2025
2 parents 8075165 + a1454eb commit 55d82ef
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions pkgs/by-name/ar/archivemount/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@
lib,
stdenv,
fetchFromSourcehut,
fetchpatch,
pkg-config,
fuse,
libarchive,
}:

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 ];
Expand All @@ -32,23 +31,14 @@ 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"
'';

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
Expand Down

0 comments on commit 55d82ef

Please sign in to comment.