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

Merge branch 'staging'

Browse Source
This commit is contained in:
Domen Kožar 2015-05-25 11:33:05 +02:00
commit bbc1df3092
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/build-support/trivial-builders.nix
View File

@ -20,13 +20,18 @@ rec {
}: }:
runCommand name runCommand name
{ inherit text executable; { inherit text executable;
passAsFile = [ "text" ];
# Pointless to do this on a remote machine. # Pointless to do this on a remote machine.
preferLocalBuild = true; preferLocalBuild = true;
} }
'' ''
n=$out${destination} n=$out${destination}
mkdir -p "$(dirname "$n")" mkdir -p "$(dirname "$n")"
echo -n "$text" > "$n" if [ -e "$textPath" ]; then
mv "$textPath" "$n"
else
echo -n "$text" > "$n"
fi
(test -n "$executable" && chmod +x "$n") || true (test -n "$executable" && chmod +x "$n") || true
''; '';

2
pkgs/development/libraries/glibc/nix-locale-archive.patch
View File

@ -6,7 +6,7 @@ diff -ru glibc-2.16.0-orig/locale/loadarchive.c glibc-2.16.0/locale/loadarchive.
+static int +static int
+open_locale_archive () +open_locale_archive (void)
+{ +{
+ int fd = -1; + int fd = -1;
+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); + char *path = getenv ("LOCALE_ARCHIVE_2_11");

10
pkgs/development/libraries/ncurses/default.nix
View File

@ -85,16 +85,16 @@ stdenv.mkDerivation rec {
libs="$(find $out/lib -name \*w.a | sed 's,.*lib\(.*\)w.a.*,\1,g')" libs="$(find $out/lib -name \*w.a | sed 's,.*lib\(.*\)w.a.*,\1,g')"
for lib in $libs; do for lib in $libs; do
if [ -e "$out/lib/lib''${lib}w.so" ]; then if [ -e "$out/lib/lib''${lib}w.so" ]; then
echo "INPUT(-l''${lib}w)" > $out/lib/lib$lib.so ln -svf lib''${lib}w.so $out/lib/lib$lib.so
ln -svf lib''${lib}w.so.${abiVersion} $out/lib/lib$lib.so.${abiVersion}
fi fi
ln -svf lib''${lib}w.a $out/lib/lib$lib.a ln -svf lib''${lib}w.a $out/lib/lib$lib.a
ln -svf ''${lib}w.pc $out/lib/pkgconfig/$lib.pc ln -svf ''${lib}w.pc $out/lib/pkgconfig/$lib.pc
done done
# Create curses compatability # Create curses compatability
echo "INPUT(-lncursesw)" > $out/lib/libcursesw.so ln -svf libncursesw.so $out/lib/libcursesw.so
echo "INPUT(-lncursesw)" > $out/lib/libcurses.so ln -svf libncursesw.so $out/lib/libcurses.so
ln -svf libncurses
'' else '' '' else ''
# Create a non-abi versioned config # Create a non-abi versioned config
cfg=$(basename $out/bin/ncurses*-config) cfg=$(basename $out/bin/ncurses*-config)
@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
ln -svf . $out/include/ncurses ln -svf . $out/include/ncurses
# Create curses compatability # Create curses compatability
echo "INPUT(-lncurses)" > $out/lib/libcurses.so ln -svf libncurses.so $out/lib/libcurses.so
''; '';
meta = { meta = {

4
pkgs/tools/text/gawk/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false }: { stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gawk-4.1.2"; name = "gawk-4.1.3";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/gawk/${name}.tar.xz"; url = "mirror://gnu/gawk/${name}.tar.xz";
sha256 = "10glh5amry76v8fzhp4phi4119zwjwzjg9ybzq971qjfhg2m72za"; sha256 = "09d6pmx6h3i2glafm0jd1v1iyrs03vcyv2rkz12jisii3vlmbkz3";
}; };
doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1 doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1