public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #57229 from dtzWill/update/e2fsprogs-1.45.0

Browse Source 
e2fsprogs: 1.44.5 -> 1.45.0
This commit is contained in:
Will Dietz 2019-03-13 11:30:13 -05:00 committed by GitHub
commit 1cb7a3b519
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/filesystems/e2fsprogs/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }: { stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "e2fsprogs-1.44.5"; pname = "e2fsprogs";
version = "1.45.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1k6iwv2bz2a8mcd1gg9kb5jpry7pil5v2h2f9apxax7g4yp1y89f"; sha256 = "1sgcjarfksa8bkx81q5cd6rzqvhzgs28a0ljwyr4ggqpfx7d18vk";
}; };
outputs = [ "bin" "dev" "out" "man" "info" ]; outputs = [ "bin" "dev" "out" "man" "info" ];
@ -34,12 +35,11 @@ stdenv.mkDerivation rec {
]; ];
checkInputs = [ perl ]; checkInputs = [ perl ];
doCheck = false; # fails doCheck = true;
# hacky way to make it install *.pc
postInstall = '' postInstall = ''
make install-libs # avoid cycle between outputs
rm "$out"/lib/*.a mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;