alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

chromium: fixup share/share

Browse source 
Reported on https://github.com/NixOS/nixpkgs/issues/11501#issuecomment-164383204
This commit is contained in:
Vladimír Čunát 2016-08-27 17:38:25 +02:00
parent 069120110d
commit f86392bfbe
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,9 +74,8 @@ in stdenv.mkDerivation {
browserBinary = "${chromium.browser}/libexec/chromium/chromium"; browserBinary = "${chromium.browser}/libexec/chromium/chromium";
getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
in with stdenv.lib; '' in with stdenv.lib; ''
mkdir -p "$out/bin" "$out/share/applications" mkdir -p "$out/bin"
ln -s "${chromium.browser}/share" "$out/share"
eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
@ -100,7 +99,11 @@ in stdenv.mkDerivation {
ln -sv "${chromium.browser.sandbox}" "$sandbox" ln -sv "${chromium.browser.sandbox}" "$sandbox"
ln -s "$out/bin/chromium" "$out/bin/chromium-browser" ln -s "$out/bin/chromium" "$out/bin/chromium-browser"
ln -s "${chromium.browser}/share/icons" "$out/share/icons"
mkdir -p "$out/share/applications"
for f in '${chromium.browser}'/share/*; do
ln -s -t "$out/share/" "$f"
done
cp -v "${desktopItem}/share/applications/"* "$out/share/applications" cp -v "${desktopItem}/share/applications/"* "$out/share/applications"
''; '';