nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

libiconv: use enableFeature for static/shared

Browse Source 
This makes things more predictable w.r.t. what is actually being built.
This commit is contained in:
Matthew Bauer 2018-07-03 16:51:30 -04:00
parent ea08cf9e6c
commit f7138342cb
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/libiconv/default.nix
View File

@ -29,9 +29,10 @@ stdenv.mkDerivation rec {
sed -i -e '/preload/d' Makefile.in
'';
configureFlags = lib.optional stdenv.isFreeBSD "--with-pic"
++ lib.optional enableStatic "--enable-static"
++ lib.optional (!enableShared) "--disable-shared";
configureFlags = [
(lib.enableFeature enableStatic "static")
(lib.enableFeature enableShared "shared")
] ++ lib.optional stdenv.isFreeBSD "--with-pic";
meta = {
description = "An iconv(3) implementation";

6
pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
View File

@ -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