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: b5590fff46b8
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: ecc48146daa9
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 27, 2019

  1. wire-desktop: expand meta 

    Added a `longDescription` and `downloadPage`. Also added myself to
`maintainers`.

I fixed up the `license` because it's actually GPLv3 *or later*.
Note that terms and conditions apply though I don't feel like they
violate the GPL-ness of the code.
    @toonn
    toonn committed Jul 27, 2019
    Copy the full SHA
    33b6a17 View commit details
    Browse the repository at this point in the history

  2. wire-desktop: Add darwin support 

    Wire Desktop is available for linux, mac os and windows. I figured
adding darwin support would be cromulent. Note that the versions don't
align 100%, this is how it's released upstream.

I refactored the derivation to seperate all the linux-specific parts. I
also sorted the dependencies and grouped them.

The changes were based on the derivation for electron. I changed the
construction from calling `mkDerivation` on a conditional merger of two
sets by moving the `mkDerivation` calls into the conditional and up to
the local bindings for `linux` and `darwin`. This required moving
`pname` and `meta` up to local bindings.
    @toonn
    toonn committed Jul 27, 2019
    Copy the full SHA
    4665e88 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #64931 from toonn/wire-desktop-refactor 

    wire-desktop: refactor to add Darwin support
    @worldofpeace
    worldofpeace committed Jul 27, 2019
    Copy the full SHA
    ecc4814 View commit details
    Browse the repository at this point in the history