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: a9d153633e15
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 69e898eb36d5
Choose a head ref
  • 2 commits
  • 8 files changed
  • 1 contributor

Commits on Dec 5, 2018

  1. ghc: don’t add libiconv automatically 

    ghc needs it to fail to correctly detect it for later.
    @matthewbauer
    matthewbauer committed Dec 5, 2018
    Copy the full SHA
    7a00e80 View commit details

  2. Merge pull request #51455 from matthewbauer/fix-46814 

    ghc: don’t add libiconv automatically
    @matthewbauer
    matthewbauer authored Dec 5, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    69e898e View commit details
17 changes: 17 additions & 0 deletions doc/stdenv.xml
View file
Original file line number Diff line number Diff line change
@@ -2525,6 +2525,23 @@ addEnvHooks "$hostOffset" myBashFunction
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
libiconv, libintl
</term>
<listitem>
<para>
A few libraries automatically add to
<literal>NIX_LDFLAGS</literal> their library, making their
symbols automatically available to the linker. This includes
libiconv and libintl (gettext). This is done to provide
compatibility between GNU Linux, where libiconv and libintl
are bundled in, and other systems where that might not be the
case. Sometimes, this behavior is not desired. To disable
this behavior, set <literal>dontAddExtraLibs</literal>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
cmake
3 changes: 3 additions & 0 deletions pkgs/development/compilers/ghc/8.2.2.nix
View file
Original file line number Diff line number Diff line change
@@ -206,6 +206,9 @@ stdenv.mkDerivation (rec {
"--disable-large-address-space"
];

# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;

# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;

3 changes: 3 additions & 0 deletions pkgs/development/compilers/ghc/8.4.4.nix
View file
Original file line number Diff line number Diff line change
@@ -186,6 +186,9 @@ stdenv.mkDerivation (rec {
# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;

# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;

nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
3 changes: 3 additions & 0 deletions pkgs/development/compilers/ghc/8.6.1.nix
View file
Original file line number Diff line number Diff line change
@@ -167,6 +167,9 @@ stdenv.mkDerivation (rec {
# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;

# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;

nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
3 changes: 3 additions & 0 deletions pkgs/development/compilers/ghc/8.6.2.nix
View file
Original file line number Diff line number Diff line change
@@ -167,6 +167,9 @@ stdenv.mkDerivation (rec {
# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;

# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;

nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
3 changes: 3 additions & 0 deletions pkgs/development/compilers/ghc/head.nix
View file
Original file line number Diff line number Diff line change
@@ -149,6 +149,9 @@ stdenv.mkDerivation (rec {
# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;

# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;

nativeBuildInputs = [
perl autoconf automake m4 python3
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
2 changes: 1 addition & 1 deletion pkgs/development/libraries/gettext/gettext-setup-hook.sh
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ addEnvHooks "$hostOffset" gettextDataDirsHook

# libintl must be listed in load flags on non-Glibc
# it doesn't hurt to have it in Glibc either though
if [ ! -z "@gettextNeedsLdflags@" ]; then
if [ -n "@gettextNeedsLdflags@" -a -z "$dontAddExtraLibs" ]; then
# See pkgs/build-support/setup-hooks/role.bash
getHostRole
export NIX_${role_pre}LDFLAGS+=" -lintl"
6 changes: 4 additions & 2 deletions pkgs/development/libraries/libiconv/setup-hook.sh
View file
Original file line number Diff line number Diff line change
@@ -2,5 +2,7 @@
# it doesn't hurt to have it in Glibc either though

# See pkgs/build-support/setup-hooks/role.bash
getHostRole
export NIX_${role_pre}LDFLAGS+=" -liconv"
if [ -z "$dontAddExtraLibs" ]; then
getHostRole
export NIX_${role_pre}LDFLAGS+=" -liconv"
fi