firefox: fix darwin wrapper
- add execdir passthru usually this is /bin on macOS it is different.
This commit is contained in:
parent
c391bd3dd3
commit
08655b16f2
4 changed files with 8 additions and 2 deletions
|
@ -174,6 +174,7 @@ stdenv.mkDerivation {
|
|||
gappsWrapperArgs+=(--argv0 "$out/bin/.firefox-wrapped")
|
||||
'';
|
||||
|
||||
passthru.execdir = "/bin";
|
||||
passthru.ffmpegSupport = true;
|
||||
passthru.gssSupport = true;
|
||||
# update with:
|
||||
|
|
|
@ -263,7 +263,7 @@ stdenv.mkDerivation (rec {
|
|||
|
||||
installPhase = if stdenv.isDarwin then ''
|
||||
mkdir -p $out/Applications
|
||||
cp -RL Firefox.app $out/Applications
|
||||
cp -LR dist/Firefox.app $out/Applications
|
||||
'' else null;
|
||||
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
|
|
|
@ -101,7 +101,11 @@ let
|
|||
nativeBuildInputs = [ makeWrapper lndir ];
|
||||
buildInputs = lib.optional (browser ? gtk3) browser.gtk3;
|
||||
|
||||
buildCommand = ''
|
||||
buildCommand = lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
cp -R --no-preserve=mode,ownership ${browser}/Applications/${browserName}.app $out/Applications
|
||||
rm -f $out${browser.execdir}/${browserName}
|
||||
'' + ''
|
||||
if [ ! -x "${browser}${browser.execdir}/${browserName}" ]
|
||||
then
|
||||
echo "cannot find executable file \`${browser}${browser.execdir}/${browserName}'"
|
||||
|
|
|
@ -337,6 +337,7 @@ stdenv.mkDerivation rec {
|
|||
$out/bin/tor-browser -version >/dev/null
|
||||
'';
|
||||
|
||||
passthru.execdir = "/bin";
|
||||
meta = with stdenv.lib; {
|
||||
description = "An unofficial version of the tor browser bundle, built from source";
|
||||
homepage = https://torproject.org/;
|
||||
|
|
Loading…
Reference in a new issue