Merge trunk

svn path=/nixpkgs/branches/libpng15/; revision=31206
2012-01-02 13:45:14 +00:00 · 2012-01-02 13:45:14 +00:00 · dd02a842e6
commit dd02a842e6
parent 455d1e934b
1 changed files with 1 additions and 1 deletions
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@ -3,7 +3,7 @@
 , withGNOME ? false, libgnomeui }:

 stdenv.mkDerivation rec {
-  inherit (src) name;
+  name = src.pkgname;

  src = fetchurl_gnome {
    project = "dia";