Merge pull request #24572 from ndowens/finalterm

finalterm-git: Cosmetic change

authored by ndowens and committed by GitHub 81e1d7eb d5a623cb

+12 -10
+12 -10
pkgs/applications/misc/finalterm/default.nix
··· 1 - { stdenv, lib, fetchgit, makeWrapper 1 + { stdenv, lib, fetchFromGitHub, makeWrapper 2 2 , pkgconfig, cmake, libxml2, vala_0_23, intltool, libmx, gnome3, gtk3, gtk_doc 3 3 , keybinder3, clutter_gtk, libnotify 4 4 , libxkbcommon, xorg, udev 5 5 , bashInteractive 6 6 }: 7 7 8 + with stdenv.lib; 9 + 8 10 stdenv.mkDerivation { 9 11 name = "finalterm-git-2014-11-15"; 10 12 11 - src = fetchgit { 12 - url = "https://github.com/p-e-w/finalterm.git"; 13 + src = fetchFromGitHub { 14 + owner = "p-e-w"; 15 + repo = "finalterm"; 13 16 rev = "39b078b2a96a5c3c9e74f92b1929f383d220ca8b"; 14 17 sha256 = "14viln5nabr39lafg1lzf6ydibz1h5d9346drp435ljxc6wsh21i"; 15 18 }; 16 19 20 + nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ]; 17 21 buildInputs = [ 18 - pkgconfig cmake vala_0_23 intltool gtk3 gnome3.gnome_common gnome3.libgee 19 - gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper 22 + vala_0_23 gtk3 gnome3.gnome_common gnome3.libgee 23 + gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify 20 24 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence 21 25 libxkbcommon 22 - ] ++ lib.optionals stdenv.isLinux [ 23 - udev 24 - ]; 26 + ] ++ optionals stdenv.isLinux [ udev ]; 25 27 26 28 preConfigure = '' 27 29 substituteInPlace data/org.gnome.finalterm.gschema.xml \ ··· 44 46 --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" 45 47 ''; 46 48 47 - meta = with lib; { 49 + meta = { 48 50 homepage = "http://finalterm.org"; 49 51 description = "A new breed of terminal emulator"; 50 52 longDescription = '' ··· 57 59 - GUI terminal controls 58 60 ''; 59 61 license = licenses.gpl3Plus; 60 - maintainers = with maintainers; [ cstrahan ]; 62 + maintainers = [ maintainers.cstrahan ]; 61 63 platforms = platforms.linux; 62 64 }; 63 65 }