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
base: 9954d5a583c1
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 1feed06d768d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 16, 2020

  1. swiften: unbreak package using Arch patch and scons flags 

    The `swiften` XMPP library was broken as of 2019. This commit
fixes it, by copying a patch from the Arch Linux PKGBUILD
(https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/swift)
and by using the same scons flags in that PKGBUILD.
Additionally, we use the SWIFTEN_INSTALLDIR env variable to actually
put something in the output.

Of note is the flag swiften_dll=1, which means that the library
is now built dynamically.
    @eeeeeta
    eeeeeta committed Jun 16, 2020
    Copy the full SHA
    557644a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #90617 from eeeeeta/unbreak-swiften

    @Mic92
    Mic92 committed Jun 16, 2020
    Copy the full SHA
    1feed06 View commit details
    Browse the repository at this point in the history