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

Merge pull request #74485 from malbarbo/e2fsprogs-shared

Browse Source 
e2fsprogs: allow static build
This commit is contained in:
Niklas Hambüchen 2019-12-06 19:07:01 +01:00 committed by GitHub
commit 3ccbce4b12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 {
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"

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

@ -115,14 +115,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;
};
@ -214,6 +215,10 @@ in {
gssSupport = false;
};
e2fsprogs = super.e2fsprogs.override {
shared = false;
};
brotli = super.brotli.override {
staticOnly = true;
};