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

Merge recent staging

Browse Source 
... to avoid double rebuild due to openldap (thousands of jobs).
This commit is contained in:
Vladimír Čunát
2016-10-29 17:13:51 +02:00
parent 4b52969f34 cd436079fc
commit 0896dbde46
4 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/mesa/default.nix
+14 -7
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch { stdenv, fetchurl, fetchpatch
, pkgconfig, intltool, autoreconfHook, substituteAll , pkgconfig, intltool, autoreconfHook, substituteAll
, file, expat, libdrm, xorg, wayland, systemd , file, expat, libdrm, xorg, wayland, systemd, openssl
, llvmPackages, libffi, libomxil-bellagio, libva , llvmPackages, libffi, libomxil-bellagio, libva
, libelf, libvdpau, python2 , libelf, libvdpau, python2
, grsecEnabled ? false , grsecEnabled ? false
@@ -71,11 +71,13 @@ stdenv.mkDerivation {
"--with-dri-driverdir=$(drivers)/lib/dri" "--with-dri-driverdir=$(drivers)/lib/dri"
"--with-dri-searchpath=${driverLink}/lib/dri" "--with-dri-searchpath=${driverLink}/lib/dri"
"--with-egl-platforms=x11,wayland,drm" "--with-egl-platforms=x11,wayland,drm"
(optionalString (stdenv.system != "armv7l-linux") ]
"--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast") ++ optionals (stdenv.system != "armv7l-linux") [
(optionalString (stdenv.system != "armv7l-linux") "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast"
"--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast") "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast"
"--with-vulkan-drivers=intel"
]
++ [
(enableFeature enableTextureFloats "texture-float") (enableFeature enableTextureFloats "texture-float")
(enableFeature grsecEnabled "glx-rts") (enableFeature grsecEnabled "glx-rts")
(enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "dri3")
@@ -112,7 +114,7 @@ stdenv.mkDerivation {
glproto dri2proto dri3proto presentproto glproto dri2proto dri3proto presentproto
libX11 libXext libxcb libXt libXfixes libxshmfence libX11 libXext libxcb libXt libXfixes libxshmfence
libffi wayland libvdpau libelf libXvMC libffi wayland libvdpau libelf libXvMC
libomxil-bellagio libva libpthreadstubs libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/
(python2.withPackages (ps: [ ps.Mako ])) (python2.withPackages (ps: [ ps.Mako ]))
] ++ optional stdenv.isLinux systemd; ] ++ optional stdenv.isLinux systemd;
@@ -134,8 +136,13 @@ stdenv.mkDerivation {
$out/lib/vdpau \ $out/lib/vdpau \
$out/lib/bellagio \ $out/lib/bellagio \
$out/lib/libxatracker* \ $out/lib/libxatracker* \
$out/lib/libvulkan_* \
# move share/vulkan/icd.d/
mv $out/share/ $drivers/
mv $out/lib/dri/* $drivers/lib/dri mv $out/lib/dri/* $drivers/lib/dri
rmdir "$out/lib/dri"
# move libOSMesa to $osmesa, as it's relatively big # move libOSMesa to $osmesa, as it's relatively big
mkdir -p {$osmesa,$drivers}/lib/ mkdir -p {$osmesa,$drivers}/lib/
pkgs/development/libraries/openldap/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
''; '';
postInstall = '' postInstall = ''
chmod +x $out/lib/*.so chmod +x "$out"/lib/*.{so,dylib}
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
pkgs/servers/x11/xorg/overrides.nix
+1
View File
@@ -217,6 +217,7 @@ in
libXrender = attrs: attrs // { libXrender = attrs: attrs // {
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];
propagatedBuildInputs = [ xorg.renderproto ];
preConfigure = setMalloc0ReturnsNullCrossCompiling; preConfigure = setMalloc0ReturnsNullCrossCompiling;
}; };
pkgs/top-level/all-packages.nix
+9 -1
View File
@@ -7925,10 +7925,18 @@ in
(if crossSystem.libc == "glibc" then libcCross (if crossSystem.libc == "glibc" then libcCross
else if crossSystem.libc == "libSystem" then darwin.libiconv else if crossSystem.libc == "libSystem" then darwin.libiconv
else libiconvReal) else libiconvReal)
else if stdenv.isGlibc then stdenv.cc.libc else if stdenv.isGlibc then glibcIconv stdenv.cc.libc
else if stdenv.isDarwin then darwin.libiconv else if stdenv.isDarwin then darwin.libiconv
else libiconvReal; else libiconvReal;
glibcIconv = libc: let
inherit (builtins.parseDrvName libc.name) name version;
libcDev = lib.getDev libc;
in runCommand "${name}-iconv-${version}" {} ''
mkdir -p $out/include
ln -sv ${libcDev}/include/iconv.h $out/include
'';
libiconvReal = callPackage ../development/libraries/libiconv { libiconvReal = callPackage ../development/libraries/libiconv {
fetchurl = fetchurlBoot; fetchurl = fetchurlBoot;
}; };