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: 80c2c5867116
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 26f47d143135
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 1, 2017

  1. libreoffice: remove spadmin wrapper 

    This change removes the spadmin wrapper because the utility was removed from LibreOffice in release 4.3. See https://wiki.documentfoundation.org/ReleaseNotes/4.3#CUPS.2C_fax_machines_and_spadmin which states:

 > The graphical utility spadmin is now removed in favor of these new features and the operating system's standard printer administration tools. (Caolán McNamara)

 Closes #26671
    Emmanuel Rosa committed Jul 1, 2017
    Copy the full SHA
    f442294 View commit details

  2. Merge pull request #27023 from emmanuelrosa/spadmin 

    libreoffice: remove spadmin wrapper
    @7c6f434c
    7c6f434c authored Jul 1, 2017
    Copy the full SHA
    26f47d1 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/applications/office/libreoffice/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/office/libreoffice/default.nix
View file
Original file line number Diff line number Diff line change
@@ -158,7 +158,7 @@ in stdenv.mkDerivation rec {
mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/"
for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do
for a in sbase scalc sdraw smath swriter simpress soffice; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a
wrapProgram "$out/bin/$a" \
--prefix XDG_DATA_DIRS : \