gnomeExtensions.dash-to-dock: refactor

Using makeFlags instead of patching Makefile
wip/yesman
Emanuele Peruffo 7 years ago
parent 8211903825
commit c1bc3012bb
  1. 2
      pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
  2. 17
      pkgs/desktops/gnome-3/extensions/dash-to-dock/fix-paths.patch

@ -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";

@ -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
Loading…
Cancel
Save