Commit graph

11 commits

Author SHA1 Message Date
Jan Tojnar
bce83c7e02
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 b34a891295)
2017-10-02 07:30:50 -04:00
Jan Tojnar
4b9e15f7a9
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 38b58bab62

(cherry picked from commit adbba9d5f6)
2017-10-02 07:30:40 -04:00
Eelco Dolstra
ea6947d6d2 Add even more dev outputs
(cherry picked from commit 28299f669a)
2017-09-27 12:33:12 +02:00
Jan Tojnar
bc28875f8c gnome3: only maintain single GNOME 3 package set (#29397)
* gnome3: only maintain single GNOME 3 package set

GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources
to update a single version of GNOME. Maintaining multiple versions just does not make sense.
Additionally, it makes viewing history using most Git tools bothersome.

This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes
the config variable for choosing packageset (`environment.gnome3.packageSet`), updates
the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`.

Closes: #29329

* maintainers/scripts/gnome: Use fixed GNOME 3 directory

Since we now allow only a single GNOME 3 package set, specifying
the working directory is not necessary.

This commit sets the directory to `pkgs/desktops/gnome-3`.

(cherry picked from commit 69698ec11c)
2017-09-24 12:45:23 +01:00
Luca Bruno
d05fa3ccfe Branch gnome 3.12 2014-05-20 13:41:33 +02:00
Luca Bruno
35ccaa2e52 Fix gsettings schemas usage for several packages due to #1901
Also add icons to epiphany
2014-04-06 11:02:21 +02:00
Domen Kožar
369c6a06bf gcr: add gobject introspection support 2014-01-26 00:18:44 +01:00
Domen Kožar
d56b0542e0 gnome3.gcr: 3.6.3 -> 3.10.1 2014-01-10 01:45:35 +01:00
Domen Kožar
3154c378ad gnome3: build packages on linux platform 2014-01-10 01:45:35 +01:00
James Cook
bae1462276 Disable introspection for gcr.
gcr stopped building after 7fbcc562 (adding introspection into GTK
libs); this gets it to build again.
2013-09-26 18:55:27 -07:00
Vladimír Čunát
38a0bc8cdf add gnome3.gcr; ToDo: tests would fail if enabled 2013-02-21 20:31:24 +01:00