public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-04-18 13:00:40 +00:00
parent 3e68106afd 0729f60697
commit d020caa5b2
1369 changed files with 35810 additions and 10571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/libelf/default.nix
View File

@@ -1,6 +1,6 @@
{ fetchurl, stdenv, gettext, glibc }:
stdenv.mkDerivation (rec {
stdenv.mkDerivation rec {
name = "libelf-0.8.13";
src = fetchurl {
@@ -18,6 +18,11 @@ stdenv.mkDerivation (rec {
nativeBuildInputs = [ glibc ];
};
# Libelf's custom NLS macros fail to determine the catalog file extension on
# Darwin, so disable NLS for now.
# FIXME: Eventually make Gettext a build input on all platforms.
configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-nls";
buildInputs = [ gettext ];
meta = {
@@ -31,12 +36,3 @@ stdenv.mkDerivation (rec {
maintainers = [ ];
};
}
//
# Libelf's custom NLS macros fail to determine the catalog file extension on
# Darwin, so disable NLS for now.
# FIXME: Eventually make Gettext a build input on all platforms.
(if stdenv.isDarwin
then { configureFlags = [ "--disable-nls" ]; }
else { }))