diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-09-06 16:50:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-06 16:50:45 -0500 |
| commit | 3b78026a7f909d1d639ed4577e8e40f279339baf (patch) | |
| tree | bb56fc654415fd948e835e2e43e63c901dbac576 /pkgs/applications/office | |
| parent | 69490696789254059fd803515a6124ef02ce7a4a (diff) | |
| parent | 9b31fcf8c046c0941a851f97de7a8779c9161e2c (diff) | |
| download | nixlib-3b78026a7f909d1d639ed4577e8e40f279339baf.tar nixlib-3b78026a7f909d1d639ed4577e8e40f279339baf.tar.gz nixlib-3b78026a7f909d1d639ed4577e8e40f279339baf.tar.bz2 nixlib-3b78026a7f909d1d639ed4577e8e40f279339baf.tar.lz nixlib-3b78026a7f909d1d639ed4577e8e40f279339baf.tar.xz nixlib-3b78026a7f909d1d639ed4577e8e40f279339baf.tar.zst nixlib-3b78026a7f909d1d639ed4577e8e40f279339baf.zip | |
Merge pull request #18297 from edwtjo/zotero-esr-verfix
zotero: remove esr suffix from version string.
Diffstat (limited to 'pkgs/applications/office')
| -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 |