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

Merge commit 'a6f6c0e' into master.upstream

Browse Source 
This is a partial merge of staging where we have up to date binaries for
all packages.
This commit is contained in:
William A. Kennington III
2015-09-15 12:16:44 -07:00
parent 316a09377d a6f6c0eeeb
commit 773b4deb7c
62 changed files with 224 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/http/mini-httpd/default.nix
View File

@@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# Fixes compat with boost 1.59
# Please attempt removing when updating
CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
meta = {
homepage = "http://mini-httpd.nongnu.org/";
description = "a minimalistic high-performance web server";

2
pkgs/servers/plex/default.nix
View File

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin"
done
find $out/usr/lib/plexmediaserver/Resources -type f -a -perm /0100 \
find $out/usr/lib/plexmediaserver/Resources -type f -a -perm -0100 \
-print -exec patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" '{}' \;

12
pkgs/servers/x11/xorg/default.nix
View File

@@ -728,11 +728,11 @@ let
}) // {inherit fontconfig freetype libX11 xproto libXrender ;};
libXi = (mkDerivation "libXi" {
name = "libXi-1.7.4";
name = "libXi-1.7.5";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2;
sha256 = "0i12lj973grlp9fa79v0vh9cahk3nf9csdjnf81iip0qcrlc5zrc";
url = mirror://xorg/individual/lib/libXi-1.7.5.tar.bz2;
sha256 = "0ad21jy40d8b2f9ldadx7lkspmvka1i9r5jqqfwxdxyqnpgdfr6r";
};
buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
}) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
@@ -928,11 +928,11 @@ let
}) // {inherit ;};
libxcb = (mkDerivation "libxcb" {
name = "libxcb-1.11";
name = "libxcb-1.11.1";
builder = ./builder.sh;
src = fetchurl {
url = http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2;
sha256 = "1xqgc81krx14f2c8yl5chzg5g2l26mhm2rwffy8dx7jv0iq5sqq3";
url = http://xcb.freedesktop.org/dist/libxcb-1.11.1.tar.bz2;
sha256 = "0c4xyvdyx5adh8dzyhnrmvwwz24gri4z1czxmxqm63i0gmngs85p";
};
buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
}) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};

2
pkgs/servers/x11/xorg/extra.list
View File

@@ -1,5 +1,5 @@
http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2
http://xcb.freedesktop.org/dist/libxcb-1.11.1.tar.bz2
http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.2.tar.bz2

2
pkgs/servers/x11/xorg/overrides.nix
View File

@@ -72,7 +72,7 @@ in
libxcb = attrs : attrs // {
nativeBuildInputs = [ args.python ];
configureFlags = "--enable-xkb";
configureFlags = "--enable-xkb --enable-xinput";
outputs = [ "out" "doc" "man" ];
};

2
pkgs/servers/x11/xorg/tarballs-7.7.list
View File

@@ -70,7 +70,7 @@ mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2
mirror://xorg/individual/lib/libXi-1.7.5.tar.bz2
mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2
mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2