chromium: Properly pass packageName and version.

We don't want ta have the source derivation in the runtime dependencies
of the browser itself. Also, we've broken the Firefox wrapper, because
we've no longer exposed the packageName attribute.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

2 files changed, 5 insertions, 4 deletions

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 34e8347b2d66..3b45ff78206c 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -88,7 +88,8 @@ let
   libExecPath = "$out/libexec/${packageName}";
 
 in stdenv.mkDerivation rec {
-  name = "${packageName}-browser-${source.version}";
+  name = "${packageName}-browser-${version}";
+  inherit (source) version;
   inherit packageName;
   src = source;
 
@@ -185,7 +186,7 @@ in stdenv.mkDerivation rec {
   installPhase = ''
     ensureDir "${libExecPath}"
     cp -v "${buildPath}/"*.pak "${libExecPath}/"
-    ${optionalString (!versionOlder source.version "34.0.0.0") ''
+    ${optionalString (!versionOlder version "34.0.0.0") ''
     cp -v "${buildPath}/icudtl.dat" "${libExecPath}/"
     ''}
     cp -vR "${buildPath}/locales" "${buildPath}/resources" "${libExecPath}/"
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 2a2490555e51..d47c9c89eb07 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -38,7 +38,7 @@ let
   };
 
 in stdenv.mkDerivation {
-  name = "chromium-${channel}-${chromium.source.version}";
+  name = "chromium-${channel}-${chromium.browser.version}";
 
   buildInputs = [ makeWrapper ];
 
@@ -53,5 +53,5 @@ in stdenv.mkDerivation {
       --add-flags "${chromium.plugins.flagsEnabled}"
   '';
 
-  inherit (chromium.browser) meta;
+  inherit (chromium.browser) meta packageName;
 }