From 18234b676821db85f6d94777c90303e513f2f110 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 20 Apr 2014 08:39:40 +0200
Subject: [PATCH] chromium: Fix package name for browser derivation.

The packageName attribute defines the output path and binary name of the
product that's going to be created, so we really want to have "chromium"
instead of "chromium-browser" here, especially for the resulting binary.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/browser.nix | 1 +
 pkgs/applications/networking/browsers/chromium/common.nix  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index e230af175300..a4b99bc58023 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -4,6 +4,7 @@ with stdenv.lib;
 
 mkChromiumDerivation (base: rec {
   name = "chromium-browser";
+  packageName = "chromium";
   buildTargets = [ "chrome" ];
 
   installPhase = ''
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 9727de1a5157..7bed83ac4c6d 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -91,7 +91,7 @@ let
   ];
 
   # build paths and release info
-  packageName = extraAttrs.name;
+  packageName = extraAttrs.packageName or extraAttrs.name;
   buildType = "Release";
   buildPath = "out/${buildType}";
   libExecPath = "$out/libexec/${packageName}";