Merge pull request #281748 from panicgh/wimlib

This commit is contained in:
Sandro 2024-02-05 15:27:52 +01:00 committed by GitHub
commit bcc5881701
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, makeWrapper
, pkg-config, openssl, fuse, libxml2
, pkg-config, fuse3
, cabextract ? null
, cdrkit ? null
, mtools ? null
@ -8,17 +8,19 @@
}:
stdenv.mkDerivation rec {
version = "1.13.6";
version = "1.14.3";
pname = "wimlib";
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ openssl fuse libxml2 ntfs3g ];
buildInputs = [ fuse3 ntfs3g ];
src = fetchurl {
url = "https://wimlib.net/downloads/${pname}-${version}.tar.gz";
sha256 = "sha256-Cg+cHA06KnZkVTWusPYuA/xVkUymXzpNVZm7iwJg29k=";
hash = "sha256-ESjGx5FtLyLagDQfhNh9d8Yg3mUA+7I6dB+nm9CM0e8=";
};
enableParallelBuilding = true;
preBuild = lib.optionalString (!stdenv.isDarwin) ''
substituteInPlace programs/mkwinpeimg.in \
--replace '/usr/lib/syslinux' "${syslinux}/share/syslinux"
@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
path = lib.makeBinPath ([ cabextract mtools ntfs3g ] ++ lib.optionals (!stdenv.isDarwin) [ cdrkit syslinux ]);
in ''
for prog in $out/bin/*; do
wrapProgram $prog --prefix PATH : ${path}
wrapProgram $prog --prefix PATH : $out/bin:${path}
done
'';
@ -43,6 +45,6 @@ stdenv.mkDerivation rec {
description = "A library and program to extract, create, and modify WIM files";
platforms = platforms.unix;
maintainers = with maintainers; [ ];
license = with licenses; [ gpl3 lgpl3 cc0 ];
license = with licenses; [ gpl3 lgpl3 mit ];
};
}