summary refs log tree commit diff
path: root/pkgs/applications/misc/termite/default.nix
diff options
context:
space:
mode:
authorMichael Hoang <Enzime@users.noreply.github.com>2018-07-14 09:00:39 +1000
committerxeji <36407913+xeji@users.noreply.github.com>2018-07-14 01:00:39 +0200
commitd73fac6b102ae6a77d0e07647f87f00e09d100b9 (patch)
treea3f80f369971fb1d6426c6aab140be656e59dfc9 /pkgs/applications/misc/termite/default.nix
parent1e4cd7a81014b2dce0f7590e90bbb42ab9e74fc2 (diff)
downloadnixlib-d73fac6b102ae6a77d0e07647f87f00e09d100b9.tar
nixlib-d73fac6b102ae6a77d0e07647f87f00e09d100b9.tar.gz
nixlib-d73fac6b102ae6a77d0e07647f87f00e09d100b9.tar.bz2
nixlib-d73fac6b102ae6a77d0e07647f87f00e09d100b9.tar.lz
nixlib-d73fac6b102ae6a77d0e07647f87f00e09d100b9.tar.xz
nixlib-d73fac6b102ae6a77d0e07647f87f00e09d100b9.tar.zst
nixlib-d73fac6b102ae6a77d0e07647f87f00e09d100b9.zip
termite: Add support for macOS (#43415)
Replace fetchgit with fetchFromGitHub now that it supports fetching
submodules. Remove unnecessary postPatch to add <math.h> as termite
already includes <cmath>. Add a patch to include <errno.h> on all
platforms and remove the --as-needed flag from ld on macOS.
Diffstat (limited to 'pkgs/applications/misc/termite/default.nix')
-rw-r--r--pkgs/applications/misc/termite/default.nix15
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index 46276bbb03fb..560dff594275 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper, wrapGAppsHook, symlinkJoin
+{ stdenv, fetchFromGitHub, lib, pkgconfig, vte, gtk3, ncurses, makeWrapper, wrapGAppsHook, symlinkJoin
 , configFile ? null
 }:
 
@@ -7,16 +7,17 @@ let
   termite = stdenv.mkDerivation {
     name = "termite-${version}";
 
-    src = fetchgit {
-      url = "https://github.com/thestinger/termite";
-      rev = "refs/tags/v${version}";
+    src = fetchFromGitHub {
+      owner = "thestinger";
+      repo = "termite";
+      rev = "v${version}";
       sha256 = "02cn70ygl93ghhkhs3xdxn5b1yadc255v3yp8cmhhyzsv5027hvj";
+      fetchSubmodules = true;
     };
 
     # https://github.com/thestinger/termite/pull/516
-    patches = [ ./url_regexp_trailing.patch ];
-
-    postPatch = "sed '1i#include <math.h>' -i termite.cc";
+    patches = [ ./url_regexp_trailing.patch ./add_errno_header.patch
+                ] ++ lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch;
 
     makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];