diff options
| author | Edward Tjörnhammar <ed@cflags.cc> | 2016-09-04 20:42:32 +0200 |
|---|---|---|
| committer | Edward Tjörnhammar <ed@cflags.cc> | 2016-09-04 21:01:40 +0200 |
| commit | 9b31fcf8c046c0941a851f97de7a8779c9161e2c (patch) | |
| tree | 4721318afc552fc43a82b2288cf20987b69e0749 /pkgs/applications/office/zotero | |
| parent | 4dfafbc0c3d1d7b418c8b3a097c7d2cded3e241e (diff) | |
| download | nixlib-9b31fcf8c046c0941a851f97de7a8779c9161e2c.tar nixlib-9b31fcf8c046c0941a851f97de7a8779c9161e2c.tar.gz nixlib-9b31fcf8c046c0941a851f97de7a8779c9161e2c.tar.bz2 nixlib-9b31fcf8c046c0941a851f97de7a8779c9161e2c.tar.lz nixlib-9b31fcf8c046c0941a851f97de7a8779c9161e2c.tar.xz nixlib-9b31fcf8c046c0941a851f97de7a8779c9161e2c.tar.zst nixlib-9b31fcf8c046c0941a851f97de7a8779c9161e2c.zip | |
zotero: remove esr suffix from version string.
Also escaped the perl regexes since that will become an error in the future.
Diffstat (limited to 'pkgs/applications/office/zotero')
| -rw-r--r-- | pkgs/applications/office/zotero/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 5a21754b44e3..3cb7ed491fbb 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 |