From 8211903825f21f5f3161d65ffbb910b7fd70924a Mon Sep 17 00:00:00 2001
From: Emanuele Peruffo <info@emanueleperuffo.com>
Date: Mon, 24 Apr 2017 11:19:52 +0200
Subject: [PATCH 1/2] gnomeExtensions.dash-to-dock: init at version v57 I
 needed this extensions and wanted to share it with everyone. I also created
 the new group called pkgs.gnomeExtensions.

---
 .../extensions/dash-to-dock/default.nix       | 26 +++++++++++++++++++
 .../extensions/dash-to-dock/fix-paths.patch   | 17 ++++++++++++
 pkgs/top-level/all-packages.nix               |  8 ++++--
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
 create mode 100644 pkgs/desktops/gnome-3/extensions/dash-to-dock/fix-paths.patch

diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
new file mode 100644
index 000000000000..782f929a3b5a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, glib, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-shell-dash-to-dock-${version}";
+  version = "v57";
+
+  src = fetchFromGitHub {
+    owner = "micheleg";
+    repo = "dash-to-dock";
+    rev = "97f6a0bb95b9f87d7a34a074c9b3624b65111794";
+    sha256 = "0b9i89hpn9k63zcrbl4bhs7qfb70wh09870fwv2ik7hajm64kynn";
+  };
+
+  nativeBuildInputs = [
+    glib gettext
+  ];
+
+  patches = [ ./fix-paths.patch ];
+
+  meta = with stdenv.lib; {
+    description = "A dock for the Gnome Shell";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ eperuffo ];
+    homepage = https://micheleg.github.io/dash-to-dock/;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/dash-to-dock/fix-paths.patch
new file mode 100644
index 000000000000..e50a797d4af5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/fix-paths.patch
@@ -0,0 +1,17 @@
+diff --git a/Makefile b/Makefile
+index fd29ef8..ec0376a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,11 +6,7 @@ EXTRA_MODULES = convenience.js dash.js docking.js appIcons.js windowPreview.js i
+ EXTRA_MEDIA = logo.svg
+ TOLOCALIZE =  prefs.js
+ MSGSRC = $(wildcard po/*.po)
+-ifeq ($(strip $(DESTDIR)),)
+-	INSTALLBASE = $(HOME)/.local/share/gnome-shell/extensions
+-else
+-	INSTALLBASE = $(DESTDIR)/usr/share/gnome-shell/extensions
+-endif
++INSTALLBASE = $(out)/share/gnome-shell/extensions
+ INSTALLNAME = dash-to-dock@micxgx.gmail.com
+
+ # The command line passed variable VERSION is used to set the version string
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f13eec079376..9b2e46b5b5c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9598,8 +9598,8 @@ with pkgs;
 
     libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { };
 
-    libqtav = callPackage ../development/libraries/libqtav { 
-      libva = libva-full; # also wants libva-x11 
+    libqtav = callPackage ../development/libraries/libqtav {
+      libva = libva-full; # also wants libva-x11
     };
 
     mlt = callPackage ../development/libraries/mlt/qt-5.nix {
@@ -17144,6 +17144,10 @@ with pkgs;
 
   gnome3 = gnome3_22;
 
+  gnomeExtensions = {
+    dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { };
+  };
+
   hsetroot = callPackage ../tools/X11/hsetroot { };
 
   kakasi = callPackage ../tools/text/kakasi { };

From c1bc3012bb66793e88de1c2e3b2ddaa5e6af59ec Mon Sep 17 00:00:00 2001
From: Emanuele Peruffo <info@emanueleperuffo.com>
Date: Mon, 24 Apr 2017 14:48:36 +0200
Subject: [PATCH 2/2] gnomeExtensions.dash-to-dock: refactor Using makeFlags
 instead of patching Makefile

---
 .../gnome-3/extensions/dash-to-dock/default.nix |  2 +-
 .../extensions/dash-to-dock/fix-paths.patch     | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/extensions/dash-to-dock/fix-paths.patch

diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
index 782f929a3b5a..4d5b29f6cc61 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     glib gettext
   ];
 
-  patches = [ ./fix-paths.patch ];
+  makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];
 
   meta = with stdenv.lib; {
     description = "A dock for the Gnome Shell";
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/dash-to-dock/fix-paths.patch
deleted file mode 100644
index e50a797d4af5..000000000000
--- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/fix-paths.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Makefile b/Makefile
-index fd29ef8..ec0376a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -6,11 +6,7 @@ EXTRA_MODULES = convenience.js dash.js docking.js appIcons.js windowPreview.js i
- EXTRA_MEDIA = logo.svg
- TOLOCALIZE =  prefs.js
- MSGSRC = $(wildcard po/*.po)
--ifeq ($(strip $(DESTDIR)),)
--	INSTALLBASE = $(HOME)/.local/share/gnome-shell/extensions
--else
--	INSTALLBASE = $(DESTDIR)/usr/share/gnome-shell/extensions
--endif
-+INSTALLBASE = $(out)/share/gnome-shell/extensions
- INSTALLNAME = dash-to-dock@micxgx.gmail.com
-
- # The command line passed variable VERSION is used to set the version string