diff options
| author | Rickard Nilsson <rickynils@gmail.com> | 2013-01-20 16:53:21 +0100 |
|---|---|---|
| committer | Rickard Nilsson <rickynils@gmail.com> | 2013-01-20 16:53:21 +0100 |
| commit | 1886d1db6a962578bd802e820a1279b4aed3333a (patch) | |
| tree | 4b938608821b25f0b972c80a837b8f8f35becc1f /pkgs/development/libraries/libnatspec | |
| parent | d1c548cdd728961350f6ee4a65d597df3b1ebe61 (diff) | |
| parent | e185691ced86fc517a2daea762d7d11e525c6ae8 (diff) | |
| download | nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.gz nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.bz2 nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.lz nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.xz nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.tar.zst nixlib-1886d1db6a962578bd802e820a1279b4aed3333a.zip | |
Merge remote-tracking branch 'upstream/master' into stdenv-updates
Diffstat (limited to 'pkgs/development/libraries/libnatspec')
| -rw-r--r-- | pkgs/development/libraries/libnatspec/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index fbab569e38cc..985745c38986 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, popt }: +{ stdenv, fetchurl, popt, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "libnatspec-0.2.6"; src = fetchurl { @@ -16,4 +16,8 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.urkud ]; }; -} +} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { + NIX_CFLAGS_COMPILE = "-I${libiconv}/include"; + + NIX_CFLAGS_LINK = "-L${libiconv}/lib -liconv"; +}) |