From f86392bfbee9d8072f6c8210df5f294072a8495a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 27 Aug 2016 17:38:25 +0200 Subject: [PATCH] chromium: fixup share/share Reported on https://github.com/NixOS/nixpkgs/issues/11501#issuecomment-164383204 --- .../networking/browsers/chromium/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index e55a599267a0..973669f87cdc 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -74,9 +74,8 @@ in stdenv.mkDerivation { browserBinary = "${chromium.browser}/libexec/chromium/chromium"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; 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" \ ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} @@ -100,7 +99,11 @@ in stdenv.mkDerivation { ln -sv "${chromium.browser.sandbox}" "$sandbox" 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" '';