From dd02a842e6f447b7e419fdc9373b73d3aae86df4 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 2 Jan 2012 13:45:14 +0000
Subject: [PATCH] Merge trunk

svn path=/nixpkgs/branches/libpng15/; revision=31206
---
 pkgs/applications/graphics/dia/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index 533e196cee4..a06ec7c0b8e 100644
--- 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";