Commit Graph

7 Commits

Author SHA1 Message Date
Orivej Desh
8414fa2d6b Revert "vinagre: disable format hardening"
This reverts commit f34b498bd2.

It did not fix the build error in https://hydra.nixos.org/build/75464534/nixlog,
but #41449 did.
2018-06-04 22:37:07 +00:00
Daiderd Jordan
0b458a4129
Merge pull request #41449 from flokli/vinagre-build
gnome3.vinagre: fix build
2018-06-04 21:32:20 +02:00
Matthew Justin Bauer
f34b498bd2
vinagre: disable format hardening
https://hydra.nixos.org/build/75464534/nixlog/1
2018-06-04 14:52:32 -04:00
Florian Klink
67eaab86b4 gnome3.vinagre: fix build
Currently, vinagre fails to build with the following message:

vinagre/vinagre-utils.c: In function 'vinagre_utils_request_credential':
vinagre/vinagre-utils.c:686:2: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
  _tmp12_ = g_strdup_printf (_tmp10_, _tmp11_);
  ^~~~~~~

vinagre-utils.c seems to be generated from vinagre-utils.vala. I
couldn't find anything weird in here, so let's disable
-Werror=format-nonliteral for now as done elsewhere, too.
2018-06-04 16:24:38 +02:00
Jan Tojnar
546e7669b2
gnome3: move src.nix into default.nix automatically 2018-03-01 02:53:00 +01:00
John Ericson
f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Jan Tojnar
69698ec11c 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`.
2017-09-24 12:15:50 +01:00