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] 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 782f929a3b5..4d5b29f6cc6 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 e50a797d4af..00000000000
--- 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