summary refs log tree commit diff
path: root/pkgs/tools/filesystems
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-12-10 19:00:06 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-12-10 19:01:27 +0100
commitf3618342ece994482697892133532a380a04cd0f (patch)
treebd6067d893770d9f7d272aaa5c5968ff517769d0 /pkgs/tools/filesystems
parent5e7e4c93a9a93c12d5eaa3a91e289d18195aaa75 (diff)
parent2ff8cef0a4c969b9c377db4e0fe6eb8f5404e0b4 (diff)
downloadnixpkgs-f3618342ece994482697892133532a380a04cd0f.tar
nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.gz
nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.bz2
nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.lz
nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.xz
nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.zst
nixpkgs-f3618342ece994482697892133532a380a04cd0f.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r--pkgs/tools/filesystems/e2fsprogs/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index eb17e9fc60c..0fd7062ac6c 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -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"