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

Merge recent staging (with binaries on Hydra)

Browse Source
This commit is contained in:
Vladimír Čunát 2016-03-30 10:41:02 +02:00
commit a26357eefe
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ else
*/ */
let let
version = "11.1.1"; version = "11.1.2";
# this is the default search path for DRI drivers # this is the default search path for DRI drivers
driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
in in
@ -38,7 +38,7 @@ stdenv.mkDerivation {
+ head (splitString "." version) + ''.x/${version}/mesa-${version}.tar.xz'') + head (splitString "." version) + ''.x/${version}/mesa-${version}.tar.xz'')
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
]; ];
sha256 = "087xlxl8dzmhzjilpsdiy19dn106spq120c9ndgnn4qlqm7hgnv4"; sha256 = "8f72aead896b340ba0f7a4a474bfaf71681f5d675592aec1cb7ba698e319148b";
}; };
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";

10
pkgs/development/tools/misc/intltool/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gettext, perl, perlXMLParser }: { stdenv, fetchurl, fetchpatch, gettext, perl, perlXMLParser }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "intltool-${version}"; name = "intltool-${version}";
@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"; sha256 = "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7";
}; };
# fix "unescaped left brace" errors when using intltool in some cases
patches = [(fetchpatch {
name = "perl-5.22.patch";
url = "https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/intltool"
+ "/debian/patches/perl5.22-regex-fixes?revision=47255&view=co";
sha256 = "17clqczb9fky7hp8czxa0fy82b5478irvz4f3fnans3sqxl95hx3";
})];
propagatedBuildInputs = [ gettext perl perlXMLParser ]; propagatedBuildInputs = [ gettext perl perlXMLParser ];
meta = with stdenv.lib; { meta = with stdenv.lib; {