diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-27 17:38:25 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-27 17:38:25 +0200 |
commit | f86392bfbee9d8072f6c8210df5f294072a8495a (patch) | |
tree | b4d82f01b26ce2ccb6956fb9a20272da4e19d667 /pkgs/applications | |
parent | 069120110db995fa2d1256b95686d3d3eb5861b1 (diff) | |
download | nixlib-f86392bfbee9d8072f6c8210df5f294072a8495a.tar nixlib-f86392bfbee9d8072f6c8210df5f294072a8495a.tar.gz nixlib-f86392bfbee9d8072f6c8210df5f294072a8495a.tar.bz2 nixlib-f86392bfbee9d8072f6c8210df5f294072a8495a.tar.lz nixlib-f86392bfbee9d8072f6c8210df5f294072a8495a.tar.xz nixlib-f86392bfbee9d8072f6c8210df5f294072a8495a.tar.zst nixlib-f86392bfbee9d8072f6c8210df5f294072a8495a.zip |
chromium: fixup share/share
Reported on https://github.com/NixOS/nixpkgs/issues/11501#issuecomment-164383204
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 9 |
1 files 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" ''; |