diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-04-23 16:34:24 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-04-23 16:34:24 +0300 |
| commit | 6df350ffc81e2a5891daa4962f68014378308c1c (patch) | |
| tree | 83b0b512783d27384a86ea8f2592a56d0492f6d6 /pkgs/applications/networking/browsers/firefox-bin/default.nix | |
| parent | 9f6baaa89a5428eac9c133a136faffc3ee5fd52d (diff) | |
| download | nixlib-6df350ffc81e2a5891daa4962f68014378308c1c.tar nixlib-6df350ffc81e2a5891daa4962f68014378308c1c.tar.gz nixlib-6df350ffc81e2a5891daa4962f68014378308c1c.tar.bz2 nixlib-6df350ffc81e2a5891daa4962f68014378308c1c.tar.lz nixlib-6df350ffc81e2a5891daa4962f68014378308c1c.tar.xz nixlib-6df350ffc81e2a5891daa4962f68014378308c1c.tar.zst nixlib-6df350ffc81e2a5891daa4962f68014378308c1c.zip | |
firefox-bin: use wrapGAppsHook
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox-bin/default.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 5bd275ba31d5..b05615e304ee 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, makeWrapper +{ stdenv, fetchurl, config, wrapGAppsHook , alsaLib , atk , cairo @@ -77,7 +77,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (source) url sha512; }; - phases = "unpackPhase installPhase"; + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc @@ -124,11 +124,12 @@ stdenv.mkDerivation { stdenv.cc.cc ]; - buildInputs = [ makeWrapper gtk3 defaultIconTheme ]; + buildInputs = [ wrapGAppsHook gtk3 defaultIconTheme ]; # "strip" after "patchelf" may break binaries. # See: https://github.com/NixOS/patchelf/issues/10 - dontStrip = 1; + dontStrip = true; + dontPatchELF = true; installPhase = '' @@ -167,10 +168,7 @@ stdenv.mkDerivation { 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" + gappsWrapperArgs+=(--argv0 "$out/bin/.firefox-wrapped") ''; passthru.ffmpegSupport = true; |