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

Merge branch 'master' into x-updates

Browse Source 
Conflicts:
	pkgs/development/compilers/vala/default.nix (it's different version)
	pkgs/development/libraries/cairo/default.nix (trivial)
This commit is contained in:
Vladimír Čunát
2013-04-17 18:26:28 +02:00
parent 6bd036d5f9 3f0ee819e2
commit ec736312d4
58 changed files with 13065 additions and 2819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/graphics/glxinfo/default.nix
View File

@@ -1,13 +1,13 @@
{stdenv, fetchurl, x11, mesa}:
let version = "8.0.1"; in
let version = "8.1.0"; in
stdenv.mkDerivation {
name = "glxinfo-${version}";
src = fetchurl {
url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2";
sha256 = "1lbp1llpx0hl5k79xb653yvjvk9mlikj73r8xjzyxqqp1nrg5isb";
sha256 = "0a58hw5850731p4smz4zqsbvyxvgjf7n5xdbs9l1wamk8q3gl0wp";
};
buildInputs = [x11 mesa];