public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18297 from edwtjo/zotero-esr-verfix 

zotero: remove esr suffix from version string.
This commit is contained in:
Thomas Tuegel 2016-09-06 16:50:45 -05:00 committed by GitHub
parent 6949069678 9b31fcf8c0
commit 3b78026a7f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/office/zotero/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xorg }: { stdenv, fetchurl, lib, bash, firefox, perl, unzipNLS, xorg }:
let let
@ -30,7 +30,7 @@ stdenv.mkDerivation {
unzip "${xpi}" -d "$out/libexec/zotero" unzip "${xpi}" -d "$out/libexec/zotero"
BUILDID=`date +%Y%m%d` BUILDID=`date +%Y%m%d`
GECKO_VERSION="${firefox.passthru.version}" GECKO_VERSION="${lib.removeSuffix "esr" firefox.passthru.version}"
UPDATE_CHANNEL="default" UPDATE_CHANNEL="default"
# Copy branding # Copy branding
@ -52,8 +52,8 @@ stdenv.mkDerivation {
# Copy application.ini and modify # Copy application.ini and modify
cp assets/application.ini "$out/libexec/zotero/application.ini" cp assets/application.ini "$out/libexec/zotero/application.ini"
perl -pi -e "s/{{VERSION}}/$version/" "$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/\{\{BUILDID}}/$BUILDID/" "$out/libexec/zotero/application.ini"
perl -pi -e "s/^MaxVersion.*\$/MaxVersion=$GECKO_VERSION/" "$out/libexec/zotero/application.ini" perl -pi -e "s/^MaxVersion.*\$/MaxVersion=$GECKO_VERSION/" "$out/libexec/zotero/application.ini"
# Copy prefs.js and modify # Copy prefs.js and modify