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

Merge ^/nixpkgs/trunk.

Browse Source 
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
This commit is contained in:
Yury G. Kudryashov
2012-03-28 15:42:42 +00:00
parent 49b7f13128 db8f709430
commit defd86049c
773 changed files with 4797 additions and 4596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/data/fonts/dejavu-fonts/default.nix
View File

@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/dejavu/dejavu-fonts-${version}.tar.bz2";
sha256 = "10m0rds36yyaznfqaa9msayv6f0v1h50zbikja6qdy5dwwxi8q5w";
};
buildFlags = "full-ttf";
preBuild = ''
sed -e s@/usr/bin/env@$(type -tP env)@ -i scripts/*
sed -e s@/usr/bin/perl@$(type -tP perl)@ -i scripts/*