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-02-27 00:08:08 +00:00
parent b4dadff542 766ad682f1
commit 3477e662e6
504 changed files with 28750 additions and 13232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gettext/default.nix
+18 -17
View File
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, libiconv, xz }:
{ stdenv, lib, fetchurl, libiconv, xz }:
stdenv.mkDerivation (rec {
name = "gettext-0.19.6";
stdenv.mkDerivation rec {
name = "gettext-${version}";
version = "0.19.7";
src = fetchurl {
url = "mirror://gnu/gettext/${name}.tar.gz";
sha256 = "0pb9vp4ifymvdmc31ks3xxcnfqgzj8shll39czmk8c1splclqjzd";
sha256 = "0gy2b2aydj8r0sapadnjw8cmb8j2rynj28d5qs1mfa800njd51jk";
};
patches = [ ./absolute-paths.diff ];
@@ -18,20 +19,20 @@ stdenv.mkDerivation (rec {
LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else "";
configureFlags = [ "--disable-csharp" "--with-xz" ]
++ (stdenv.lib.optionals stdenv.isCygwin
[ "--disable-java"
++ lib.optionals stdenv.isCygwin [
"--disable-java"
"--disable-native-java"
# Share the cache among the various `configure' runs.
"--config-cache"
"--with-included-gettext"
"--with-included-glib"
"--with-included-libcroco"
])
]
# avoid retaining reference to CF during stdenv bootstrap
++ (stdenv.lib.optionals stdenv.isDarwin [
"gt_cv_func_CFPreferencesCopyAppValue=no"
"gt_cv_func_CFLocaleCopyCurrent=no"
]);
++ lib.optionals stdenv.isDarwin [
"gt_cv_func_CFPreferencesCopyAppValue=no"
"gt_cv_func_CFLocaleCopyCurrent=no"
];
postPatch = ''
substituteAllInPlace gettext-runtime/src/gettext.sh.in
@@ -49,16 +50,16 @@ stdenv.mkDerivation (rec {
echo gl_cv_func_wcwidth_works=yes > cachefile
configureFlags="$configureFlags --cache-file=`pwd`/cachefile"
fi
'' + stdenv.lib.optionalString stdenv.isCygwin ''
'' + lib.optionalString stdenv.isCygwin ''
sed -i -e "s/\(am_libgettextlib_la_OBJECTS = \)error.lo/\\1/" gettext-tools/gnulib-lib/Makefile.in
'';
buildInputs = [ xz ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
buildInputs = [ xz ] ++ lib.optional (!stdenv.isLinux) libiconv;
enableParallelBuilding = true;
crossAttrs = {
buildInputs = stdenv.lib.optional (stdenv ? ccCross && stdenv.ccCross.libc ? libiconv)
buildInputs = lib.optional (stdenv ? ccCross && stdenv.ccCross.libc ? libiconv)
stdenv.ccCross.libc.libiconv.crossDrv;
# Gettext fails to guess the cross compiler
configureFlags = "CXX=${stdenv.cross.config}-g++";
@@ -88,8 +89,8 @@ stdenv.mkDerivation (rec {
homepage = http://www.gnu.org/software/gettext/;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
maintainers = with lib.maintainers; [ zimbatm ];
platforms = lib.platforms.all;
};
}
@@ -106,4 +107,4 @@ stdenv.mkDerivation (rec {
sed -i gettext-tools/gnulib-lib/Makefile.in \
-e 's/am_libgettextlib_la_OBJECTS =/am_libgettextlib_la_OBJECTS = error.lo/g'
'';
})
}