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

Merge master into x-updates

Browse Source 
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
This commit is contained in:
Vladimír Čunát
2013-12-18 23:21:29 +01:00
parent e8394e3f8c 43498628e8
commit 4c5a71f777
431 changed files with 2365 additions and 1307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/silgraphite/graphite2.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, freetype, cmake }:
stdenv.mkDerivation rec {
version = "1.2.3";
version = "1.2.4";
name = "graphite2-${version}";
src = fetchurl {
url = "mirror://sourceforge/silgraphite/graphite2/${name}.tgz";
sha256 = "1xgwnd81gm6p293x8paxb3yisnvpj5qnv1dzr7bjdi7b7h00ls7g";
sha256 = "00xhv1mp640fr3wmdzwn4yz0g56jd4r9fb7b02mc1g19h0bdbhsb";
};
buildInputs = [ pkgconfig freetype cmake ];