diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:30:19 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:30:19 +0200 |
| commit | 1dc36904d8cefa8188c785efd03274637c838e31 (patch) | |
| tree | 0cf37f0803f1e9c6985d09f2870e5ec61229d2ca /pkgs/applications/networking/browsers/firefox-bin/default.nix | |
| parent | 75f1cc61b86b002f551529f1cafa30b4f4010bd9 (diff) | |
| parent | 7a005601d48f760864258e369364b3b847d4e9fd (diff) | |
| download | nixlib-1dc36904d8cefa8188c785efd03274637c838e31.tar nixlib-1dc36904d8cefa8188c785efd03274637c838e31.tar.gz nixlib-1dc36904d8cefa8188c785efd03274637c838e31.tar.bz2 nixlib-1dc36904d8cefa8188c785efd03274637c838e31.tar.lz nixlib-1dc36904d8cefa8188c785efd03274637c838e31.tar.xz nixlib-1dc36904d8cefa8188c785efd03274637c838e31.tar.zst nixlib-1dc36904d8cefa8188c785efd03274637c838e31.zip | |
Merge #14920: windows improvements, mainly mingw
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox-bin/default.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/default.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index d07aec33eb0c..3b653d9d871b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, config +{ stdenv, fetchurl, config, makeWrapper , alsaLib , atk , cairo @@ -13,7 +13,8 @@ , glibc , gst_plugins_base , gstreamer -, gtk +, gtk2 +, gtk3 , libX11 , libXScrnSaver , libXcomposite @@ -26,6 +27,7 @@ , libcanberra , libgnome , libgnomeui +, defaultIconTheme , mesa , nspr , nss @@ -64,7 +66,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2"; - inherit (source) sha256; + inherit (source) sha512; }; phases = "unpackPhase installPhase"; @@ -85,7 +87,8 @@ stdenv.mkDerivation { glibc gst_plugins_base gstreamer - gtk + gtk2 + gtk3 libX11 libXScrnSaver libXcomposite @@ -109,6 +112,8 @@ stdenv.mkDerivation { stdenv.cc.cc ]; + buildInputs = [ makeWrapper gtk3 defaultIconTheme ]; + # "strip" after "patchelf" may break binaries. # See: https://github.com/NixOS/patchelf/issues/10 dontStrip = 1; @@ -144,6 +149,11 @@ stdenv.mkDerivation { GenericName=Web Browser Categories=Application;Network; EOF + + wrapProgram "$out/bin/firefox" \ + --argv0 "$out/bin/.firefox-wrapped" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \ + --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ''; meta = with stdenv.lib; { |