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

e2fsprogs: allow static build

Browse Source
This commit is contained in:
Marco A L Barbosa 2019-11-28 09:57:27 -03:00
parent 62d0993e87
commit f6ea33023e
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 { stdenv.mkDerivation rec {
pname = "e2fsprogs"; pname = "e2fsprogs";
@ -36,7 +36,9 @@ stdenv.mkDerivation rec {
configureFlags = configureFlags =
if stdenv.isLinux then [ 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-symlink-install"
"--enable-relative-symlinks" "--enable-relative-symlinks"
"--with-crond-dir=no" "--with-crond-dir=no"

9
pkgs/top-level/static.nix
View File

@ -82,14 +82,15 @@ in {
} // optionalAttrs super.stdenv.hostPlatform.isDarwin { } // optionalAttrs super.stdenv.hostPlatform.isDarwin {
pythonSupport = false; pythonSupport = false;
}); });
zlib = (super.zlib.override { zlib = super.zlib.override {
static = true; static = true;
shared = false; shared = false;
splitStaticOutput = false;
# Don’t use new stdenv zlib because # Don’t use new stdenv zlib because
# it doesn’t like the --disable-shared flag # it doesn’t like the --disable-shared flag
stdenv = super.stdenv; stdenv = super.stdenv;
}).static; };
xz = super.xz.override { xz = super.xz.override {
enableStatic = true; enableStatic = true;
}; };
@ -177,6 +178,10 @@ in {
gssSupport = false; gssSupport = false;
}; };
e2fsprogs = super.e2fsprogs.override {
shared = false;
};
brotli = super.brotli.override { brotli = super.brotli.override {
staticOnly = true; staticOnly = true;
}; };