Commit 40483b3b authored by K900's avatar K900
Browse files

firefox-bin: derive binary name from channel

parent 43eecf9c

pkgs/applications/networking/browsers/firefox-bin/default.nix

+5 −3
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ let 


  inherit (generated) version sources;



  binaryName = if channel == "release" then "firefox" else "firefox-${channel}";



  mozillaPlatforms = {

    i686-linux = "linux-i686";

    x86_64-linux = "linux-x86_64";
@@ -85,7 +87,7 @@ stdenv.mkDerivation { 
      cp -r * "$prefix/lib/firefox-bin-${version}"



      mkdir -p "$out/bin"

      ln -s "$prefix/lib/firefox-bin-${version}/firefox" "$out/bin/"

      ln -s "$prefix/lib/firefox-bin-${version}/firefox" "$out/bin/${binaryName}"



      # See: https://github.com/mozilla/policy-templates/blob/master/README.md

      mkdir -p "$out/lib/firefox-bin-${version}/distribution";
@@ -93,7 +95,7 @@ stdenv.mkDerivation { 
    '';



  passthru = {

    binaryName = "firefox";

    inherit binaryName;

    libName = "firefox-bin-${version}";

    ffmpegSupport = true;

    gssSupport = true;
@@ -119,6 +121,6 @@ stdenv.mkDerivation { 
    platforms = builtins.attrNames mozillaPlatforms;

    hydraPlatforms = [];

    maintainers = with maintainers; [ taku0 lovesegfault ];

    mainProgram = "firefox";

    mainProgram = binaryName;

  };

}

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -32162,7 +32162,6 @@ with pkgs; 
  };















  firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped {













    nameSuffix = "-devedition";















    pname = "firefox-devedition-bin";















    desktopName = "Firefox DevEdition";















    wmClass = "firefox-devedition";