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

svn merge ^/nixpkgs/trunk

Browse Source 
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
This commit is contained in:
Yury G. Kudryashov
2012-02-06 23:03:12 +00:00
parent b31c67e24d 4e3dcd9254
commit 215a07c1a9
208 changed files with 2222 additions and 2185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/enblend-enfuse/default.nix
+9 -6
View File
@@ -1,14 +1,17 @@
{stdenv, fetchurl, libtiff, libpng, lcms, libxmi, boost }:
{stdenv, fetchurl, libtiff, libpng, lcms, libxmi, boost, mesa, freeglut
, pkgconfig, perl, glew }:
stdenv.mkDerivation {
name = "enblend-enfuse-3.2";
stdenv.mkDerivation rec {
name = "enblend-enfuse-4.0";
src = fetchurl {
url = mirror://sourceforge/enblend/enblend-enfuse-3.2.tar.gz;
sha256 = "0ly6fdn5ym1v6m1f4gqc6s4zqgrfcys1ypfm82g5qbhh66x6gqw4";
url = "mirror://sourceforge/enblend/${name}.tar.gz";
sha256 = "1i2kq842zrncpadarhcikg447abmh5r7a5js3mzg553ql3148am1";
};
buildInputs = [ libtiff libpng lcms libxmi boost ];
buildInputs = [ libtiff libpng lcms libxmi boost mesa freeglut glew ];
buildNativeInputs = [ perl pkgconfig ];
meta = {
homepage = http://enblend.sourceforge.net/;