summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorzimbatm <zimbatm@zimbatm.com>2016-07-07 10:14:20 +0100
committerGitHub <noreply@github.com>2016-07-07 10:14:20 +0100
commitc44098feace2366f38188faeb9f4cc5f068628ab (patch)
tree03045a7b1b09ab9663227996ee56dc9e2cbfa53b /pkgs/applications
parentc7b809298daf1dd8802782f61c1078d062223387 (diff)
parent31d3efa0d4836ef863f6db540b0b51712f9b43d4 (diff)
downloadnixlib-c44098feace2366f38188faeb9f4cc5f068628ab.tar
nixlib-c44098feace2366f38188faeb9f4cc5f068628ab.tar.gz
nixlib-c44098feace2366f38188faeb9f4cc5f068628ab.tar.bz2
nixlib-c44098feace2366f38188faeb9f4cc5f068628ab.tar.lz
nixlib-c44098feace2366f38188faeb9f4cc5f068628ab.tar.xz
nixlib-c44098feace2366f38188faeb9f4cc5f068628ab.tar.zst
nixlib-c44098feace2366f38188faeb9f4cc5f068628ab.zip
Merge pull request #16459 from mpscholten/iterm2-build-from-source
iTerm2: 2.1.4 -> 3.0.2 and refactoring
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/misc/iterm2/default.nix17
-rw-r--r--pkgs/applications/misc/iterm2/disable_updates.patch11
2 files changed, 21 insertions, 7 deletions
diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/misc/iterm2/default.nix
index 4aac8ab72d2c..add16365324e 100644
--- a/pkgs/applications/misc/iterm2/default.nix
+++ b/pkgs/applications/misc/iterm2/default.nix
@@ -1,18 +1,21 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "iterm2-${version}";
-  version = "2.1.4";
+  version = "3.0.2";
 
-  src = fetchurl {
-    url = "https://iterm2.com/downloads/stable/iTerm2-2_1_4.zip";
-    sha256 = "1kb4j1p1kxj9dcsd34709bm2870ffzpq6jig6q9ixp08g0zbhqhh";
+  src = fetchFromGitHub {
+    owner = "gnachman";
+    repo = "iTerm2";
+    rev = "v${version}";
+    sha256 = "121g759i814y1g1g1jwhsmxgg4wrzv08vq7a7qwc7b85a17zbd3h";
   };
 
-  buildInputs = [ unzip ];
+  patches = [ ./disable_updates.patch ];
+  makeFlagsArray = ["Deployment"];
   installPhase = ''
     mkdir -p "$out/Applications"
-    mv "$(pwd)" "$out/Applications/iTerm.app"
+    mv "build/Deployment/iTerm2.app" "$out/Applications/iTerm.app"
   '';
 
   meta = {
diff --git a/pkgs/applications/misc/iterm2/disable_updates.patch b/pkgs/applications/misc/iterm2/disable_updates.patch
new file mode 100644
index 000000000000..e717c58f30f1
--- /dev/null
+++ b/pkgs/applications/misc/iterm2/disable_updates.patch
@@ -0,0 +1,11 @@
+--- iTerm2/sources/iTermPreferences.m   2016-06-23 16:55:28.000000000 +0200
++++ iTerm2/sources/iTermPreferences.m   2016-06-23 16:55:42.000000000 +0200
+@@ -189,7 +189,7 @@
+                   kPreferenceKeyInstantReplayMemoryMegabytes: @4,
+                   kPreferenceKeySavePasteAndCommandHistory: @NO,
+                   kPreferenceKeyAddBonjourHostsToProfiles: @NO,
+-                  kPreferenceKeyCheckForUpdatesAutomatically: @YES,
++                  kPreferenceKeyCheckForUpdatesAutomatically: @NO,
+                   kPreferenceKeyCheckForTestReleases: @NO,
+                   kPreferenceKeyLoadPrefsFromCustomFolder: @NO,
+                   kPreferenceKeyNeverRemindPrefsChangesLostForFileHaveSelection: @NO,