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: b61d084c41c2
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5acac622e319
Choose a head ref
  • 6 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 2, 2017

  1. pinentry: add GNOME 3 frontend support 

    (cherry picked from commit 4ad9878)
    @jtojnar @grahamc
    jtojnar authored and grahamc committed Oct 2, 2017
    Copy the full SHA
    a32a56b View commit details
    Browse the repository at this point in the history

  2. gnome3.gcr: propagate pkg-config dependencies 

    The pinentry_gnome package requires gcr. Unfortunately, when configure
asks about the library (or `pkg-config --libs gcr-base-3` is used) it
fails because glib is not in scope.

```
$ pkg-config --libs gcr-base-3
Package glib-2.0 was not found in the pkg-config search path.
Perhaps you should add the directory containing `glib-2.0.pc'
to the PKG_CONFIG_PATH environment variable
Package 'glib-2.0', required by 'gcr-base-3', not found
```

This commit moves glib and gtk to `propagatedBuildInputs` so pkgconfig
could find them.

See also 38b58ba

(cherry picked from commit adbba9d)
    @jtojnar @grahamc
    jtojnar authored and grahamc committed Oct 2, 2017
    Copy the full SHA
    4b9e15f View commit details
    Browse the repository at this point in the history

  3. pinentry: fix configure arguments 

    pinentry 0.9.6 changed the `qt4` flag to just `qt`. Additionally,
the `--with-x` option has not been there for a while. This commit
renames and removes the flags, respectively.

(cherry picked from commit 75bf151)
    @jtojnar @grahamc
    jtojnar authored and grahamc committed Oct 2, 2017
    Copy the full SHA
    d4f93f1 View commit details
    Browse the repository at this point in the history

  4. pinentry: add optional libsecret dependency 

    libsecret is used for cacheing passwords.

(cherry picked from commit feddf1b)
    @jtojnar @grahamc
    jtojnar authored and grahamc committed Oct 2, 2017
    Copy the full SHA
    5de8c52 View commit details
    Browse the repository at this point in the history

  5. gnome3.gcr: prevent dependency cycle 

    When overriding gnupg to uss pinentry gnome3 frontend, there is
a dependency cycle:

    gnupg → pinentry_gnome → gcr → gnupg

This commit overrides the gnupg required by gcr to not build GUI.

(cherry picked from commit b34a891)
    @jtojnar @grahamc
    jtojnar authored and grahamc committed Oct 2, 2017
    Copy the full SHA
    bce83c7 View commit details
    Browse the repository at this point in the history

  6. pinentry: make GTK3 the default front-end 

    See: #18559
(cherry picked from commit 3f7e3db)
    @jtojnar @grahamc
    jtojnar authored and grahamc committed Oct 2, 2017
    Copy the full SHA
    5acac62 View commit details
    Browse the repository at this point in the history