diff options
| author | Emanuele Peruffo <info@emanueleperuffo.com> | 2017-04-24 14:48:36 +0200 |
|---|---|---|
| committer | Emanuele Peruffo <info@emanueleperuffo.com> | 2017-04-24 14:48:36 +0200 |
| commit | c1bc3012bb66793e88de1c2e3b2ddaa5e6af59ec (patch) | |
| tree | b344eed4dc790726b45268120dab21e5b1b69526 /pkgs/desktops | |
| parent | 8211903825f21f5f3161d65ffbb910b7fd70924a (diff) | |
| download | nixlib-c1bc3012bb66793e88de1c2e3b2ddaa5e6af59ec.tar nixlib-c1bc3012bb66793e88de1c2e3b2ddaa5e6af59ec.tar.gz nixlib-c1bc3012bb66793e88de1c2e3b2ddaa5e6af59ec.tar.bz2 nixlib-c1bc3012bb66793e88de1c2e3b2ddaa5e6af59ec.tar.lz nixlib-c1bc3012bb66793e88de1c2e3b2ddaa5e6af59ec.tar.xz nixlib-c1bc3012bb66793e88de1c2e3b2ddaa5e6af59ec.tar.zst nixlib-c1bc3012bb66793e88de1c2e3b2ddaa5e6af59ec.zip | |
gnomeExtensions.dash-to-dock: refactor
Using makeFlags instead of patching Makefile
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/extensions/dash-to-dock/fix-paths.patch | 17 |
2 files changed, 1 insertions, 18 deletions
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 |