From 87699227bb751dcab926296c351f918f7f40691c Mon Sep 17 00:00:00 2001
From: dan4ik <6057430gu@gmail.com>
Date: Fri, 2 Jul 2021 15:13:33 +0700
Subject: [PATCH 1/3] icecat-bin: init at 60.7.0

---
 .../browsers/icecat-bin/default.nix           | 135 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 2 files changed, 137 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/icecat-bin/default.nix

diff --git a/pkgs/applications/networking/browsers/icecat-bin/default.nix b/pkgs/applications/networking/browsers/icecat-bin/default.nix
new file mode 100644
index 000000000000..51d2516edb03
--- /dev/null
+++ b/pkgs/applications/networking/browsers/icecat-bin/default.nix
@@ -0,0 +1,135 @@
+{ stdenv
+, lib
+, fetchurl
+, autoPatchelfHook
+, wrapGAppsHook
+, gnome2
+, nss
+, xdg-utils
+, xorg
+, alsa-lib
+, atk
+, cairo
+, cups
+, curl
+, dbus
+, expat
+, fontconfig
+, freetype
+, gdk-pixbuf
+, glib
+, gtk3
+, libX11
+, libxcb
+, libXScrnSaver
+, libXcomposite
+, libXcursor
+, libXdamage
+, libXext
+, libXfixes
+, libXi
+, libXrandr
+, libXrender
+, libXtst
+, libdrm
+, libnotify
+, libopus
+, libpulseaudio
+, libuuid
+, libxshmfence
+, mesa
+, nspr
+, pango
+, systemd
+, at-spi2-atk
+, at-spi2-core
+, xlibs
+}:
+
+let
+  mirror = "https://mirror.tochlab.net/pub/gnu/gnuzilla";
+  name = "icecat";
+in
+
+stdenv.mkDerivation rec {
+  pname = "icecat-bin";
+  version = "60.7.0";
+
+  src = fetchurl {
+    url = "${mirror}/${version}/${name}-${version}.en-US.gnulinux-x86_64.tar.bz2";
+    sha256 = "sha256-Tw3/565dmKY71EsrDb05+T1gBWORIU6FZYkqsa3jaoU=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    nss
+    xdg-utils
+    xorg.libxkbfile
+    alsa-lib
+    at-spi2-atk
+    at-spi2-core
+    atk
+    cairo
+    cups
+    curl
+    dbus
+    expat
+    fontconfig.lib
+    freetype
+    gdk-pixbuf
+    glib
+    gnome2.GConf
+    gnome2.gtk
+    gtk3
+    libX11
+    libXScrnSaver
+    libXcomposite
+    libXcursor
+    libXdamage
+    libXext
+    libXfixes
+    libXi
+    libXrandr
+    libXrender
+    libXtst
+    libdrm
+    libnotify
+    libopus
+    libuuid
+    libxcb
+    libxshmfence
+    mesa
+    nspr
+    nss
+    pango
+    xlibs.libXt
+    stdenv.cc.cc.lib
+  ];
+
+  unpackPhase = ''
+    mkdir -p $TMP/ $out/{opt,bin}
+    tar -xvf $src -C $TMP/
+  '';
+
+  installPhase = ''
+    cp -r $TMP/icecat/* $out/opt/
+    ln -sf $out/opt/icecat-bin $out/bin/icecat
+  '';
+
+  runtimeDependencies = [
+    libpulseaudio.out
+    (lib.getLib systemd)
+  ];
+
+  meta = with lib; {
+    description = "Binary build of the GNU version of the Mozilla Firefox browser";
+    homepage = "https://www.gnu.org/software/gnuzilla/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ dan4ik605743 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6961be94b87..1d1bc6df8a8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24723,6 +24723,8 @@ in
 
   icewm = callPackage ../applications/window-managers/icewm {};
 
+  icecat-bin = callPackage ../applications/networking/browsers/icecat-bin { };
+
   id3v2 = callPackage ../applications/audio/id3v2 { };
 
   ideamaker = libsForQt5.callPackage ../applications/misc/ideamaker { };

From 16d173961d95261c645099a06327e7a0e2130cee Mon Sep 17 00:00:00 2001
From: dan4ik <6057430gu@gmail.com>
Date: Sat, 3 Jul 2021 12:34:33 +0700
Subject: [PATCH 2/3] icecat-bin: Fixed dependencies

---
 pkgs/applications/networking/browsers/icecat-bin/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/icecat-bin/default.nix b/pkgs/applications/networking/browsers/icecat-bin/default.nix
index 51d2516edb03..de5a852d186e 100644
--- a/pkgs/applications/networking/browsers/icecat-bin/default.nix
+++ b/pkgs/applications/networking/browsers/icecat-bin/default.nix
@@ -43,7 +43,6 @@
 , systemd
 , at-spi2-atk
 , at-spi2-core
-, xlibs
 }:
 
 let
@@ -106,7 +105,7 @@ stdenv.mkDerivation rec {
     nspr
     nss
     pango
-    xlibs.libXt
+    xorg.libXt
     stdenv.cc.cc.lib
   ];
 

From d569ee3a08f771ba776f36ff779b3d8169685a79 Mon Sep 17 00:00:00 2001
From: dan4ik <6057430gu@gmail.com>
Date: Tue, 6 Jul 2021 12:45:48 +0700
Subject: [PATCH 3/3] icecat-bin: fix default.nix

---
 .../networking/browsers/icecat-bin/default.nix  | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/browsers/icecat-bin/default.nix b/pkgs/applications/networking/browsers/icecat-bin/default.nix
index de5a852d186e..6f5da5b92a64 100644
--- a/pkgs/applications/networking/browsers/icecat-bin/default.nix
+++ b/pkgs/applications/networking/browsers/icecat-bin/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , lib
-, fetchurl
+, fetchzip
 , autoPatchelfHook
 , wrapGAppsHook
 , gnome2
@@ -45,18 +45,13 @@
 , at-spi2-core
 }:
 
-let
-  mirror = "https://mirror.tochlab.net/pub/gnu/gnuzilla";
-  name = "icecat";
-in
-
 stdenv.mkDerivation rec {
   pname = "icecat-bin";
   version = "60.7.0";
 
-  src = fetchurl {
-    url = "${mirror}/${version}/${name}-${version}.en-US.gnulinux-x86_64.tar.bz2";
-    sha256 = "sha256-Tw3/565dmKY71EsrDb05+T1gBWORIU6FZYkqsa3jaoU=";
+  src = fetchzip {
+    url = "https://mirror.tochlab.net/pub/gnu/gnuzilla/${version}/icecat-${version}.en-US.gnulinux-x86_64.tar.bz2";
+    sha256 = "sha256-bEapbQIcZXQ0Tip/X1Q0guowpr3wNDYsFbHGmTbc5mE=";
   };
 
   nativeBuildInputs = [
@@ -111,11 +106,11 @@ stdenv.mkDerivation rec {
 
   unpackPhase = ''
     mkdir -p $TMP/ $out/{opt,bin}
-    tar -xvf $src -C $TMP/
+    cp $src/* $TMP/ -r
   '';
 
   installPhase = ''
-    cp -r $TMP/icecat/* $out/opt/
+    cp -r $TMP/* $out/opt/
     ln -sf $out/opt/icecat-bin $out/bin/icecat
   '';