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

Merge pull request #50054 from samueldr/fixes/libreoffice-misc

Browse Source 
Fixes weird mismatch with libreoffice and libreoffice-unwrapped.
This commit is contained in:
Michael Raskin 2018-11-09 20:04:49 +00:00 committed by GitHub
commit 74f3d2f8c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/office/libreoffice/wrapper.nix
View File

@ -13,4 +13,7 @@ in
for i in $(ls "${libreoffice}/bin/"); do for i in $(ls "${libreoffice}/bin/"); do
test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")" test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")"
done done
'') // { inherit libreoffice dbus; } '') // {
inherit libreoffice dbus;
meta = libreoffice.meta;
}

20
pkgs/top-level/all-packages.nix
View File

@ -17677,6 +17677,7 @@ with pkgs;
librecad = callPackage ../applications/misc/librecad { }; librecad = callPackage ../applications/misc/librecad { };
libreoffice = hiPrio libreoffice-still; libreoffice = hiPrio libreoffice-still;
libreoffice-unwrapped = libreoffice.libreoffice;
libreoffice-args = { libreoffice-args = {
inherit (perlPackages) ArchiveZip IOCompress; inherit (perlPackages) ArchiveZip IOCompress;
@ -17698,21 +17699,20 @@ with pkgs;
}; };
}; };
libreoffice-unwrapped = callPackage ../applications/office/libreoffice
(libreoffice-args // {
});
libreoffice-still-unwrapped = callPackage ../applications/office/libreoffice/still.nix
(libreoffice-args // {
poppler = poppler_0_61;
});
libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
libreoffice = libreoffice-unwrapped; libreoffice = callPackage ../applications/office/libreoffice
(libreoffice-args // {
});
}); });
libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice;
libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
libreoffice = libreoffice-still-unwrapped; libreoffice = callPackage ../applications/office/libreoffice/still.nix
(libreoffice-args // {
poppler = poppler_0_61;
});
}); });
libreoffice-still-unwrapped = libreoffice-still.libreoffice;
libvmi = callPackage ../development/libraries/libvmi { }; libvmi = callPackage ../development/libraries/libvmi { };