diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/terminal-emulators')
4 files changed, 44 insertions, 49 deletions
diff --git a/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix index 3b0d30280419..e101d5d3a8cd 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.20.3"; + version = "0.21.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-rORIrbUqtQZuU6TjjYP7IZHfCPeLnrNy6wInnAwhG48="; + sha256 = "sha256-/+OSVjC4++A4kaxEfI2kIgjXxL67lfoXCdH2PykLWxA="; }; buildInputs = [ @@ -63,26 +63,26 @@ buildPythonApplication rec { outputs = [ "out" "terminfo" ]; - patches = [ - ./fix-paths.patch - ]; - # Causes build failure due to warning hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; dontConfigure = true; - buildPhase = if stdenv.isDarwin then '' - ${python.interpreter} setup.py kitty.app \ - --update-check-interval=0 \ - --disable-link-time-optimization - make man - '' else '' - ${python.interpreter} setup.py linux-package \ - --update-check-interval=0 \ - --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ - --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ - --canberra-library='${libcanberra}/lib/libcanberra.so' + buildPhase = '' + runHook preBuild + ${if stdenv.isDarwin then '' + ${python.interpreter} setup.py kitty.app \ + --update-check-interval=0 \ + --disable-link-time-optimization + make man + '' else '' + ${python.interpreter} setup.py linux-package \ + --update-check-interval=0 \ + --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ + --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ + --canberra-library='${libcanberra}/lib/libcanberra.so' + ''} + runHook postBuild ''; checkInputs = [ pillow ]; diff --git a/nixpkgs/pkgs/applications/terminal-emulators/kitty/fix-paths.patch b/nixpkgs/pkgs/applications/terminal-emulators/kitty/fix-paths.patch deleted file mode 100644 index 380f6d749146..000000000000 --- a/nixpkgs/pkgs/applications/terminal-emulators/kitty/fix-paths.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/docs/Makefile -+++ b/docs/Makefile -@@ -3,7 +3,7 @@ -# Patching is needed here for the following reason: -# * importing the `constants` package from Kitty has a side effect that it -# creates the user configuration directory. This package gets imported -# while sphinx scans the code for documentation strings. -# - - # You can set these variables from the command line. - SPHINXOPTS = -j auto -T $(FAIL_WARN) --SPHINXBUILD = sphinx-build -+SPHINXBUILD = PYTHONPATH=${PYTHONPATH}:.. HOME=${TMPDIR}/kitty-build-home sphinx-build - SPHINXPROJ = kitty - SOURCEDIR = . - BUILDDIR = _build diff --git a/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix index beecb3e278d5..88dae0a34ff5 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, xrdb, xlsfonts }: -stdenv.mkDerivation { - name = "urxvt-font-size-2015-05-22"; - dontPatchShebangs = true; +stdenv.mkDerivation rec { + name = "urxvt-font-size"; + version = "1.3"; src = fetchFromGitHub { owner = "majutsushi"; repo = "urxvt-font-size"; - rev = "fd5b09c10798c6723bbf771d4d8881cf6563bc69"; - sha256 = "16m3kkypg3y00x597zx05zy167a0kaqpawz0l591wzb2bv1dz55z"; + rev = "v${version}"; + sha256 = "1526ap161cp3378f4ijd09nmsh71ld7bkxxhp8p6razdi2v8r16h"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/terminal-emulators/sakura/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/sakura/default.nix index af56f54a4149..fbebf6590d07 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/sakura/default.nix @@ -1,30 +1,41 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , cmake -, pkg-config +, glib , gtk3 +, makeWrapper +, pcre2 , perl +, pkg-config , vte -, pcre2 -, glib -, makeWrapper }: stdenv.mkDerivation rec { pname = "sakura"; - version = "3.7.1"; + version = "3.8.2"; src = fetchurl { url = "https://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2"; - sha256 = "sha256-cppODnUKQpS9kFkkOqxU3yqAElAVn8VQtQsP4Carkos="; + sha256 = "sha256-nd/okZrg4RZzyiKHmuMkVl0Jh7FOlI4dK63/U4/htbk="; }; - nativeBuildInputs = [ cmake perl pkg-config makeWrapper ]; + nativeBuildInputs = [ + cmake + makeWrapper + perl + pkg-config + ]; - buildInputs = [ gtk3 vte pcre2 glib ]; + buildInputs = [ + glib + gtk3 + pcre2 + vte + ]; - # Set path to gsettings-schemata so sakura knows - # where to find colorchooser, fontchooser etc. + # Set path to gsettings-schemata so sakura knows where to find colorchooser, + # fontchooser etc. postInstall = '' wrapProgram $out/bin/sakura \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ |