diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-16 15:16:08 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-16 15:16:08 -0400 |
| commit | ddbe9191ef1549e7695e5e02e545b1b3db46edb4 (patch) | |
| tree | 90e8f4e8bf5c4410b351229cdc637333bae88024 /pkgs/desktops/gnome-2/desktop | |
| parent | 16b6f53910f19b84c5d8c5fb58a8ce958fc8a7d3 (diff) | |
| parent | f3fcf1b0a9b0398620b5fa9b40268ef651aa373e (diff) | |
| download | nixpkgs-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar nixpkgs-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.gz nixpkgs-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.bz2 nixpkgs-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.lz nixpkgs-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.xz nixpkgs-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.zst nixpkgs-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Keep the dontCheck because the test suite fails, get rid of the LDFLAGS hack because we don't need it!
Diffstat (limited to 'pkgs/desktops/gnome-2/desktop')
| -rw-r--r-- | pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 6feaf13d88e..99a45d0a769 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -39,8 +39,5 @@ stdenv.mkDerivation rec { intltoolize --force ''; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - doCheck = false; # requires X11 daemon - } |