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

Merge branch 'x-updates' into master

Browse Source
This commit is contained in:
Vladimír Čunát 2013-09-12 18:56:48 +02:00
commit f7843b341b
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/gtk+/3.x.nix
View File

@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null; assert cupsSupport -> cups != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtk+-3.8.2"; name = "gtk+-3.8.4";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gtk+/3.8/${name}.tar.xz"; url = "mirror://gnome/sources/gtk+/3.8/${name}.tar.xz";
sha256 = "15zjmyky4yw70ipi12dllira4av8wjpw5f7g9kbrbpx12nf0ra0w"; sha256 = "1qlj0qdhkp8j5xiris4l4xnx47g4pbk4qnj3nf8rwa82fwb610xh";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
license = "LGPLv2+"; license = "LGPLv2+";
maintainers = with stdenv.lib.maintainers; [urkud raskin]; maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat];
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} }

11
pkgs/development/libraries/libpng/default.nix
View File

@ -3,9 +3,9 @@
assert zlib != null; assert zlib != null;
let let
version = "1.6.3"; version = "1.6.4";
sha256 = "0i8gz8mbkygc0ny7aa2i2wiavysxy6fdaphl52l49fb3hv9w1v65"; sha256 = "15pqany43q2hzaxqn84p9dba071xmvqi8h1bhnjxnxdf3g64zayg";
patch_src = fetchurl { patch_src = throw "apng patch not yet released" fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
sha256 = "0fjnb6cgbj2c7ggl0qzcnliml2ylrjxzigp89vw0hxq221k5mlsx"; sha256 = "0fjnb6cgbj2c7ggl0qzcnliml2ylrjxzigp89vw0hxq221k5mlsx";
}; };
@ -27,10 +27,11 @@ in stdenv.mkDerivation rec {
passthru = { inherit zlib; }; passthru = { inherit zlib; };
meta = { meta = with stdenv.lib; {
description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch";
homepage = http://www.libpng.org/pub/png/libpng.html; homepage = http://www.libpng.org/pub/png/libpng.html;
license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
maintainers = [ maintainers.vcunat ];
}; };
} }

3
pkgs/development/libraries/mesa/default.nix
View File

@ -24,6 +24,7 @@ else
let let
version = "9.1.6"; version = "9.1.6";
# this is the default search path for DRI drivers (note: X server introduces an overriding env var)
driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -134,6 +135,8 @@ stdenv.mkDerivation {
patchelf --set-rpath "$(patchelf --print-rpath $lib):$drivers/lib" "$lib" patchelf --set-rpath "$(patchelf --print-rpath $lib):$drivers/lib" "$lib"
fi fi
done done
'' + /* set the default search path for DRI drivers; used e.g. by X server */ ''
substituteInPlace "$out/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}"
''; '';
#ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM