Commit graph

3249 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
Jan Tojnar
d950babd0e
gnome3.nautilus: add thumbnailers
Nautilus, resp. gnome-desktop, scans `thumbnailers` directories
under the paths in `XDG_DATA_DIRS`. gdk-pixbuf was not, for some
reason, listed in the variable, therefore Nautilus did not generate
image thumbnails.

I also add librsvg to the variable so that SVG files can be rendered.
It does not work at the moment, though, because of incorrect path to
the renderer.

(cherry picked from commit baa7e397c1)
2017-10-01 08:40:27 -04:00
Jan Tojnar
80c5c690e7
gnome3.evolution-data-server: Re-add GNOME Online Accounts support
In #26879, GNOME Online Accounts support was removed resulting in
repeated authentication prompts for users relying on services like
Google Calendar.

This commit removes the build flag that disabled the support.

(cherry picked from commit 29dd3accf5)
2017-09-30 19:24:16 -04:00
José Romildo Malaquias
a7ca4e2909
lxqt.screengrab: 2017-02-18 -> 1.97 (#29835)
(cherry picked from commit 7d883056a0)
2017-09-28 13:10:23 +02:00
Eelco Dolstra
ea6947d6d2 Add even more dev outputs
(cherry picked from commit 28299f669a)
2017-09-27 12:33:12 +02:00
Eelco Dolstra
0208f54229 Add more dev outputs
(cherry picked from commit 8ccce8de89)
2017-09-27 12:32:51 +02:00
Eelco Dolstra
bf92abb6ab Add some dev outputs
(cherry picked from commit 60aaced9a0)
2017-09-27 12:32:23 +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
Tuomas Tynkkynen
f5d5180562 darwin: Disable some packages that have never built successfully
mate.mate-desktop: https://hydra.nixos.org/build/61110037
gdmap: https://hydra.nixos.org/build/61144743
redsocks: https://hydra.nixos.org/build/61123106
resolv_wrapper: https://hydra.nixos.org/build/61121132
ogmtools: https://hydra.nixos.org/build/61108726
mp3info: https://hydra.nixos.org/build/61139015
lxappearance-gtk3: https://hydra.nixos.org/build/61126327
hdf5-fortran: https://hydra.nixos.org/build/61146631
pqiv: https://hydra.nixos.org/build/61124724

(cherry picked from commit ab71280823)
2017-09-22 17:27:49 +03:00
romildo
5976b3514d
gnome-shell-extensions: enable all extensions
(cherry picked from commit 349782cee4)
2017-09-17 18:31:44 +02:00
gnidorah
50e57c4e59
maxx: allow launching individual components
(cherry picked from commit d627ded461)
2017-09-17 18:19:29 +02:00
Thomas Tuegel
4515d4af50
Merge pull request #29369 from bkchr/remove_kde4_workspace_kde_telepathy
Remove kde4workspace and kdetelepathy

(cherry picked from commit 815135f31b)
2017-09-14 11:19:36 -05:00
Jan Tojnar
fd1b9e357d gnome-disk-utility: fix missing schemas for gnome-disk-image-mounter
Continuation of #28053

gnome-disk-image-mounter from gnome-disk-utility was not wrapped, resulting in an
error due to the inability to find gsettings schemas.

This commit replaces the manual wrapping of gnome-disks binary with wrapGAppsHook
so that all binaries are wrapped correctly.

(cherry picked from commit b64f149ea9)
2017-09-13 07:41:26 +02:00
romildo
7a2f00d288
efl: 1.20.2 -> 1.20.3
(cherry picked from commit b776cd02bf)
2017-09-10 17:55:47 +02:00
Aleksey Kladov
a6bba8335b lxqt-session: fix the build
closes #29130

(cherry picked from commit 6ce21acf32)
2017-09-09 16:14:27 +02:00
romildo
b893ee4ae2
terminology: 1.1.0 -> 1.1.1
(cherry picked from commit dce314e55b)
2017-09-08 16:25:35 +02:00
Samuel Leathers
201d7cddc6
gnome2.gtkhtml4: init at 4.10.0
(cherry picked from commit 2aa8bc45d3)
2017-09-08 16:23:27 +02:00
Eelco Dolstra
460df30bd8
Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper"
This reverts commit 0a944b345e, reversing
changes made to 61733ed6cc.

I dislike these massive stdenv changes with unclear motivation,
especially when they involve gratuitous mass renames like NIX_CC ->
NIX_BINUTILS. The previous such rename (NIX_GCC -> NIX_CC) caused
months of pain, so let's not do that again.

(cherry picked from commit ec8d41f08c)
2017-09-07 12:53:33 +02:00
Vladimír Čunát
42c68301f4
maxx: license fixups
The main thing is that I'm convinced the license can't be free when it
restricts redistribution to certain platforms.  That probably holds with
the usual definitions like from Debian, FSF or OSI.

(cherry picked from commit 8414d8386b)
2017-09-05 12:11:30 +02:00
John Ericson
89481b70ea misc pkgs: Use $NIX_BINUTILS for when needed
Certain files are now only there instead of $NIX_CC (some are in both)

(cherry picked from commit 3f30cffa55)
2017-09-03 11:30:38 -04:00
Jörg Thalheim
4da94b1e50 gpaste: add adwaita-icon-theme theme
(cherry picked from commit c2881983fb)
2017-09-03 16:28:42 +01:00
Jan Tojnar
fb192f7583 gnome3.gpaste: refactor
(cherry picked from commit 4069cb2b0f)
2017-09-03 16:28:32 +01:00
Thomas Tuegel
56efb14e02
kscreenlocker: 5.10.5 -> 5.10.5.1
Fix segfault with nVidia drivers; see
https://bugs.kde.org/show_bug.cgi?id=384005

(cherry picked from commit 71d377fcb0)
2017-09-03 11:17:58 +02:00
Gabriel Ebner
bd6b318461
gnome3.dconf-editor: include gsettings_desktop_schemas
(cherry picked from commit 52eb0e0fbd)
2017-09-02 12:18:30 +02:00
Frederik Rietdijk
6d4bd78fad Merge commit '2858c41' into HEAD 2017-08-30 21:07:07 +02:00
Symphorien Gibol
bd54589233 networkmanager_iodine: init at 1.2.0 2017-08-30 02:58:29 +02:00
Vladimír Čunát
2858c41823
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
2017-08-29 10:51:54 +02:00
Tom Hunger
64e4b9637b Remove unused gdm/3.16-wip 2017-08-28 19:52:06 +01:00
Tom Hunger
3247c940e0 gnome-photos: 3.24.2 -> -3.24.3 2017-08-28 15:55:05 +01:00
Linus Heckemann
b73e3b6095 GNOME: 3.22 -> 3.24
This is a squash commit of the joint work from:

* Jan Tojnar (@jtojnar)
* Linus Heckemann (@lheckemann)
* Ryan Mulligan (@ryantm)
* romildo (@romildo)
* Tom Hunger (@teh)
2017-08-28 15:32:49 +01:00
Vladimír Čunát
592d23d7db
maxx: fix evaluation
Occurences of `$'` apparently do have to be quoted in ''-strings.
2017-08-27 17:06:46 +02:00
Joachim F
3c4ffdcbbc Merge pull request #28477 from romildo/fix.efl
enlightenment fixes and updates
2017-08-26 21:51:09 +00:00
Vladimír Čunát
1e7358a875
kde4.kde_workspace: fixup build with gcc-6 2017-08-26 11:31:41 +02:00
Jörg Thalheim
ddf540d44c Merge pull request #27096 from gnidorah/maxx
maxx: init at 1.1.0
2017-08-25 06:40:31 +01:00
Thomas Tuegel
639c355b3a Merge pull request #28500 from bkchr/lxqt_config_fixes
LXQT-config: Adds patch for Cmake >3.8
2017-08-24 12:48:06 -05:00
gnidorah
15ae2cbeea maxx: use libredirect 2017-08-24 19:34:08 +03:00
Bastian Köcher
0cf6830309 LXQT-config: Adds patch for Cmake >3.8 2017-08-23 12:17:32 +02:00
Bastian Köcher
b7d1b3214d Plasma: 5.10.4 -> 5.10.5 2017-08-23 10:58:21 +02:00
romildo
7ffee4de3c efl: use vanilla pkg-config
Use vanilla pkg-config to build EFL applications.

The EFL library has a set of pkg-config files (*.pc) which uses
private requirements. The default pkg-config setup on nixpkgs is
patched to disable resolving those requirements. See
http://bugs.freedesktop.org/show_bug.cgi?id=4738 for reference.

As a consequence each package depending on efl has to explicitly set
the search path in order to be able to find the corresponding header
files.

By using vanilla pkg-config this is not necessary (and this is the
expected behaviour for pkg-config), allowing simpler nix expressions.
2017-08-22 15:54:56 -03:00
romildo
d1cbd546e0 terminology: 1.0.0 -> 1.1.0 2017-08-22 15:13:17 -03:00
romildo
5340a0aee0 efl: remove old version 1.19.1
- Version 1.19.1 is not needed anymore to build ephoto.
2017-08-22 15:08:59 -03:00
romildo
978c9f02dc ephoto: 1.0 -> 1.5
- Update to version 1.5, which builds of the latest efl versions
2017-08-22 15:01:25 -03:00
romildo
0c16f356bd efl: propagate utillinux, fribidi and SDL2, which are runtime dependencies 2017-08-22 14:56:47 -03:00
Thomas Tuegel
49fb3b9313 Merge pull request #28366 from vandenoever/kde-applications
KDE Frameworks: 5.36 -> 5.37 and KDE Applications 17.04.3 -> 17.08.0
2017-08-22 06:53:25 -05:00
Vladimír Čunát
b2ae23a391
Merge branch 'staging' (older version)
This just adds some fixups, not any mass rebuild.
2017-08-22 12:30:04 +02:00
WilliButz
a49c1fc0b2 caribou: fix build 2017-08-22 00:45:42 +02:00
Jos van den Oever
ca90567174 lxqt-notificationd: add missing dependency 2017-08-21 21:49:32 +02:00
Jos van den Oever
161118af02 lxqt-runner: add missing dependency 2017-08-21 21:49:32 +02:00
Jos van den Oever
e20afe8d2e kde-frameworks: 5.36 -> 5.37 2017-08-21 21:47:15 +02:00