summary refs log tree commit diff
path: root/pkgs/applications/misc/calcurse
diff options
context:
space:
mode:
authorLangston Barrett <langston.barrett@gmail.com>2017-12-26 15:52:18 -0600
committerGraham Christensen <graham@grahamc.com>2017-12-26 16:52:18 -0500
commitc9ec07309f61c4610852003aec803165b435b5ec (patch)
tree681c2ea6916d799f43cb4bdd4ab11226e4897f79 /pkgs/applications/misc/calcurse
parent152c3865648163dbbc6d7fcff5d79f3281cbae55 (diff)
downloadnixpkgs-c9ec07309f61c4610852003aec803165b435b5ec.tar
nixpkgs-c9ec07309f61c4610852003aec803165b435b5ec.tar.gz
nixpkgs-c9ec07309f61c4610852003aec803165b435b5ec.tar.bz2
nixpkgs-c9ec07309f61c4610852003aec803165b435b5ec.tar.lz
nixpkgs-c9ec07309f61c4610852003aec803165b435b5ec.tar.xz
nixpkgs-c9ec07309f61c4610852003aec803165b435b5ec.tar.zst
nixpkgs-c9ec07309f61c4610852003aec803165b435b5ec.zip
calcurse: 4.2.0 -> 4.3.0 (#33036)
* calcurse: 4.2.0 -> 4.3.0
Diffstat (limited to 'pkgs/applications/misc/calcurse')
-rw-r--r--pkgs/applications/misc/calcurse/default.nix18
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix
index 3f22d1629e2..d4b07cb91dc 100644
--- a/pkgs/applications/misc/calcurse/default.nix
+++ b/pkgs/applications/misc/calcurse/default.nix
@@ -1,20 +1,26 @@
-{stdenv, fetchurl, ncurses, gettext, python3, makeWrapper }:
+{ stdenv, fetchurl, ncurses, gettext, python3, python3Packages, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "calcurse-${version}";
-  version = "4.2.2";
+  version = "4.3.0";
 
   src = fetchurl {
     url = "http://calcurse.org/files/${name}.tar.gz";
-    sha256 = "0il0y06akdqgy0f9p40m4x6arn66nh7sr1w1i41bszycs7div266";
+    sha256 = "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i";
   };
 
-  buildInputs = [ncurses gettext python3 ];
+  buildInputs = [ ncurses gettext python3 ];
   nativeBuildInputs = [ makeWrapper ];
 
+  # Build Python environment with httplib2 for calcurse-caldav
+  pythonEnv = python3Packages.python.buildEnv.override {
+    extraLibs = [ python3Packages.httplib2 ];
+  };
+  propogatedBuildInputs = [ pythonEnv ];
+
   postInstall = ''
-    makeWrapper ${python3}/bin/python3 $out/bin/calcurse-caldav 
-      '';
+    substituteInPlace $out/bin/calcurse-caldav --replace /usr/bin/python3 ${pythonEnv}/bin/python3
+  '';
 
   meta = with stdenv.lib; {
     description = "A calendar and scheduling application for the command line";