philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

chromium: Properly pass packageName and version.

Browse source 
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>
This commit is contained in:
aszlig 2014-03-24 12:02:49 +01:00
parent eadbf855b0
commit 202755ca2f
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/networking/browsers/chromium/browser.nix
View file

@ -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}/"

4
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -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;
}