summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorndowens <ndowens04@gmail.com>2017-04-03 20:10:44 -0500
committerGitHub <noreply@github.com>2017-04-03 20:10:44 -0500
commit81e1d7eb55e6c91b6094a63fbb4c81bdda4e98af (patch)
treec583767f88369f02ca73d3e5b98aac0e66f197e4 /pkgs
parentd5a623cb39ee33ddb9589abe6bc640315437258f (diff)
parent968e6d823b669f52b541219b53de59073ea3713a (diff)
downloadnixpkgs-81e1d7eb55e6c91b6094a63fbb4c81bdda4e98af.tar
nixpkgs-81e1d7eb55e6c91b6094a63fbb4c81bdda4e98af.tar.gz
nixpkgs-81e1d7eb55e6c91b6094a63fbb4c81bdda4e98af.tar.bz2
nixpkgs-81e1d7eb55e6c91b6094a63fbb4c81bdda4e98af.tar.lz
nixpkgs-81e1d7eb55e6c91b6094a63fbb4c81bdda4e98af.tar.xz
nixpkgs-81e1d7eb55e6c91b6094a63fbb4c81bdda4e98af.tar.zst
nixpkgs-81e1d7eb55e6c91b6094a63fbb4c81bdda4e98af.zip
Merge pull request #24572 from ndowens/finalterm
finalterm-git: Cosmetic change
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/finalterm/default.nix22
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix
index 1d8412a25f3..053cdd05991 100644
--- a/pkgs/applications/misc/finalterm/default.nix
+++ b/pkgs/applications/misc/finalterm/default.nix
@@ -1,27 +1,29 @@
-{ stdenv, lib, fetchgit, makeWrapper
+{ stdenv, lib, fetchFromGitHub, makeWrapper
 , pkgconfig, cmake, libxml2, vala_0_23, intltool, libmx, gnome3, gtk3, gtk_doc
 , keybinder3, clutter_gtk, libnotify
 , libxkbcommon, xorg, udev
 , bashInteractive
 }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation {
   name = "finalterm-git-2014-11-15";
 
-  src = fetchgit {
-    url = "https://github.com/p-e-w/finalterm.git";
+  src = fetchFromGitHub {
+    owner = "p-e-w";
+    repo = "finalterm";
     rev = "39b078b2a96a5c3c9e74f92b1929f383d220ca8b";
     sha256 = "14viln5nabr39lafg1lzf6ydibz1h5d9346drp435ljxc6wsh21i";
   };
 
+  nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ];
   buildInputs = [
-    pkgconfig cmake vala_0_23 intltool gtk3 gnome3.gnome_common gnome3.libgee
-    gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper
+    vala_0_23 gtk3 gnome3.gnome_common gnome3.libgee
+    gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify
     xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence
     libxkbcommon
-  ] ++ lib.optionals stdenv.isLinux [
-    udev
-  ];
+  ] ++ optionals stdenv.isLinux [ udev ];
 
   preConfigure = ''
     substituteInPlace data/org.gnome.finalterm.gschema.xml \
@@ -44,7 +46,7 @@ stdenv.mkDerivation {
       --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "http://finalterm.org";
     description = "A new breed of terminal emulator";
     longDescription = ''
@@ -57,7 +59,7 @@ stdenv.mkDerivation {
       - GUI terminal controls
     '';
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ cstrahan ];
+    maintainers = [ maintainers.cstrahan ];
     platforms = platforms.linux;
   };
 }