From 9b31fcf8c046c0941a851f97de7a8779c9161e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 4 Sep 2016 20:42:32 +0200
Subject: [PATCH] zotero: remove esr suffix from version string.

Also escaped the perl regexes since that will become an error in the future.
---
 pkgs/applications/office/zotero/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 5a21754b44e..3cb7ed491fb 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xorg }:
+{ stdenv, fetchurl, lib, bash, firefox, perl, unzipNLS, xorg }:
 
 let
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     unzip "${xpi}" -d "$out/libexec/zotero"
 
     BUILDID=`date +%Y%m%d`
-    GECKO_VERSION="${firefox.passthru.version}"
+    GECKO_VERSION="${lib.removeSuffix "esr" firefox.passthru.version}"
     UPDATE_CHANNEL="default"
 
     # Copy branding
@@ -52,8 +52,8 @@ stdenv.mkDerivation {
 
     # Copy application.ini and modify
     cp assets/application.ini "$out/libexec/zotero/application.ini"
-    perl -pi -e "s/{{VERSION}}/$version/" "$out/libexec/zotero/application.ini"
-    perl -pi -e "s/{{BUILDID}}/$BUILDID/" "$out/libexec/zotero/application.ini"
+    perl -pi -e "s/\{\{VERSION}}/$version/" "$out/libexec/zotero/application.ini"
+    perl -pi -e "s/\{\{BUILDID}}/$BUILDID/" "$out/libexec/zotero/application.ini"
     perl -pi -e "s/^MaxVersion.*\$/MaxVersion=$GECKO_VERSION/" "$out/libexec/zotero/application.ini"
 
     # Copy prefs.js and modify