Unverified Commit 6b4b347d authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #219170 from rikhuijzer/edge-file-open 

microsoft-edge: fix file picker and `substituteInPlace`
parents 045658ef a48211c3

pkgs/applications/networking/browsers/microsoft-edge/browser.nix

+13 −3
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
{ stdenv

, fetchurl

, lib

, makeWrapper



, binutils-unwrapped

, xz
@@ -62,6 +63,10 @@ stdenv.mkDerivation rec { 
    inherit sha256;

  };



  nativeBuildInputs = [

    makeWrapper

  ];



  unpackCmd = "${binutils-unwrapped}/bin/ar p $src data.tar.xz | ${xz}/bin/xz -dc | ${gnutar}/bin/tar -xf -";

  sourceRoot = ".";
@@ -170,7 +175,7 @@ stdenv.mkDerivation rec { 
      --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName}



    substituteInPlace $out/opt/microsoft/${shortName}/xdg-mime \

      --replace "''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \

      --replace "\''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "\''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \

      --replace "xdg_system_dirs=/usr/local/share/:/usr/share/" "xdg_system_dirs=/run/current-system/sw/share/" \

      --replace /usr/bin/file ${file}/bin/file
@@ -178,8 +183,13 @@ stdenv.mkDerivation rec { 
      --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName}



    substituteInPlace $out/opt/microsoft/${shortName}/xdg-settings \

      --replace "''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \

      --replace "''${XDG_CONFIG_DIRS:-/etc/xdg}" "''${XDG_CONFIG_DIRS:-/run/current-system/sw/etc/xdg}"

      --replace "\''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "\''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \

      --replace "\''${XDG_CONFIG_DIRS:-/etc/xdg}" "\''${XDG_CONFIG_DIRS:-/run/current-system/sw/etc/xdg}"

  '';



  postFixup = ''

    wrapProgram "$out/bin/${longName}" \

      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}"

  '';



  meta = with lib; {