Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2e2cb2890c6a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 37771e47ebac
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 18, 2020

  1. wpsoffice: 11.1.0.8865 -> 11.1.0.9080

    @Th0rgal @bennofs
    Th0rgal authored and bennofs committed Jan 18, 2020
    Copy the full SHA
    37771e4 View commit details
Showing with 4 additions and 8 deletions.
  1. +4 −8 pkgs/applications/office/wpsoffice/default.nix
12 changes: 4 additions & 8 deletions pkgs/applications/office/wpsoffice/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@

stdenv.mkDerivation rec{
pname = "wpsoffice";
version = "11.1.0.8865";
version = "11.1.0.9080";

src = fetchurl {
url = "http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/8865/wps-office_11.1.0.8865_amd64.deb";
sha256 = "1hfpj1ayhzlrnnp72yjzrpd60xsbj9y46m345lqysiaj1hnwdbd8";
url = "http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9080/wps-office_11.1.0.9080.XA_amd64.deb";
sha256 = "1731e9aea22ef4e558ad66b1373d863452b4f570aecf09d448ae28a821333454";
};
unpackCmd = "dpkg -x $src .";
sourceRoot = ".";
@@ -75,24 +75,20 @@ stdenv.mkDerivation rec{
mkdir -p $out
cp -r opt $out
cp -r usr/* $out
# Avoid forbidden reference error due use of patchelf
rm -r *
for i in wps wpp et wpspdf; do
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--force-rpath --set-rpath "$(patchelf --print-rpath $prefix/office6/$i):${stdenv.cc.cc.lib}/lib64:${libPath}" \
$prefix/office6/$i
substituteInPlace $out/bin/$i \
--replace /opt/kingsoft/wps-office $prefix
done
for i in $out/share/applications/*;do
substituteInPlace $i \
--replace /usr/bin $out/bin \
--replace /opt/kingsoft/wps-office $prefix
done
'';
}
}