diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-03 16:51:30 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-03 16:51:30 -0400 |
| commit | f7138342cb5b6278fbb59ea4cd647c2c00e3c53d (patch) | |
| tree | 8138628c69184e748815d55e68621347f0f2fc82 /pkgs/os-specific/darwin/apple-source-releases | |
| parent | ea08cf9e6c0d77c08dfc557b61270a9559f8eddc (diff) | |
| download | nixlib-f7138342cb5b6278fbb59ea4cd647c2c00e3c53d.tar nixlib-f7138342cb5b6278fbb59ea4cd647c2c00e3c53d.tar.gz nixlib-f7138342cb5b6278fbb59ea4cd647c2c00e3c53d.tar.bz2 nixlib-f7138342cb5b6278fbb59ea4cd647c2c00e3c53d.tar.lz nixlib-f7138342cb5b6278fbb59ea4cd647c2c00e3c53d.tar.xz nixlib-f7138342cb5b6278fbb59ea4cd647c2c00e3c53d.tar.zst nixlib-f7138342cb5b6278fbb59ea4cd647c2c00e3c53d.zip | |
libiconv: use enableFeature for static/shared
This makes things more predictable w.r.t. what is actually being built.
Diffstat (limited to 'pkgs/os-specific/darwin/apple-source-releases')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index 369556fd5a1c..d325e38b272e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -10,8 +10,10 @@ appleDerivation { sed -i 's/darwin\*/ios\*/g' configure libcharset/configure ''; - configureFlags = lib.optional enableStatic "--enable-static" - ++ lib.optional (!enableShared) "--disable-shared"; + configureFlags = [ + (lib.enableFeature enableStatic "static") + (lib.enableFeature enableShared "shared") + ]; postInstall = lib.optionalString (!enableStatic) '' mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib |