e2fsprogs: allow static build
This commit is contained in:
parent
62d0993e87
commit
f6ea33023e
2 changed files with 11 additions and 4 deletions
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo }:
|
||||
{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, shared ? true }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "e2fsprogs";
|
||||
|
@ -36,7 +36,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags =
|
||||
if stdenv.isLinux then [
|
||||
"--enable-elf-shlibs"
|
||||
# It seems that the e2fsprogs is one of the few packages that cannot be
|
||||
# build with shared and static libs.
|
||||
(if shared then "--enable-elf-shlibs" else "--disable-elf-shlibs")
|
||||
"--enable-symlink-install"
|
||||
"--enable-relative-symlinks"
|
||||
"--with-crond-dir=no"
|
||||
|
|
|
@ -82,14 +82,15 @@ in {
|
|||
} // optionalAttrs super.stdenv.hostPlatform.isDarwin {
|
||||
pythonSupport = false;
|
||||
});
|
||||
zlib = (super.zlib.override {
|
||||
zlib = super.zlib.override {
|
||||
static = true;
|
||||
shared = false;
|
||||
splitStaticOutput = false;
|
||||
|
||||
# Don’t use new stdenv zlib because
|
||||
# it doesn’t like the --disable-shared flag
|
||||
stdenv = super.stdenv;
|
||||
}).static;
|
||||
};
|
||||
xz = super.xz.override {
|
||||
enableStatic = true;
|
||||
};
|
||||
|
@ -177,6 +178,10 @@ in {
|
|||
gssSupport = false;
|
||||
};
|
||||
|
||||
e2fsprogs = super.e2fsprogs.override {
|
||||
shared = false;
|
||||
};
|
||||
|
||||
brotli = super.brotli.override {
|
||||
staticOnly = true;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue