diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
commit | ab15a62c68bf7bf3b02e3bab00d121cc1426733c (patch) | |
tree | 398a82403b04bfa0bae8cadf1c5a64cf83145965 /pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix | |
parent | c643ccaa8c91f78b8c89eb87589886b8906d5b38 (diff) | |
parent | a26357eefe017964448b5bb464163646b927a267 (diff) | |
download | nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.gz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.bz2 nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.lz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.xz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.zst nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.zip |
Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
Diffstat (limited to 'pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix')
-rw-r--r-- | pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix index 3bbb25ca5c19..052a16affdc0 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix @@ -1,27 +1,22 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango , gnome_doc_utils, intltool, libX11, which, libuuid, vala -, desktop_file_utils, itstool, makeWrapper, appdata-tools }: +, desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools - gnome3.dconf itstool makeWrapper gnome3.nautilus vala ]; + gnome3.dconf itstool gnome3.nautilus vala ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ]; + nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 + desktop_file_utils wrapGAppsHook ]; # FIXME: enable for gnome3 configureFlags = [ "--disable-search-provider" "--disable-migration" ]; - preFixup = '' - for f in "$out/libexec/gnome-terminal-server"; do - wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" - done - ''; - meta = with stdenv.lib; { + description = "The GNOME Terminal Emulator"; + homepage = https://wiki.gnome.org/Apps/Terminal/; platforms = platforms.linux; maintainers = gnome3.maintainers; }; |