Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ea08cf9e6c0d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f7138342cb5b
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jul 3, 2018

  1. libiconv: use enableFeature for static/shared 

    This makes things more predictable w.r.t. what is actually being built.
    @matthewbauer
    matthewbauer committed Jul 3, 2018
    Copy the full SHA
    f713834 View commit details
Showing with 8 additions and 5 deletions.
  1. +4 −3 pkgs/development/libraries/libiconv/default.nix
  2. +4 −2 pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
7 changes: 4 additions & 3 deletions pkgs/development/libraries/libiconv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 4 additions & 2 deletions pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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