Skip to content

Instantly share code, notes, and snippets.

@ivan
Created December 22, 2019 20:31
Show Gist options
  • Save ivan/ec0fabe224e32c99a25f65eaabf65d72 to your computer and use it in GitHub Desktop.
Save ivan/ec0fabe224e32c99a25f65eaabf65d72 to your computer and use it in GitHub Desktop.
nixpkgs-konsole-master.patch
From a6866872917d38678804c838a4db2abd489508d6 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Wed, 18 Dec 2019 06:36:45 +0000
Subject: [PATCH] konsole: 19.08.3 -> unstable-2019-12-18
This fixes the tab activity highlighting, which does not work at all
in 19.08.3.
---
pkgs/applications/kde/default.nix | 4 ++--
pkgs/applications/kde/srcs.nix | 13 +++++++------
pkgs/top-level/all-packages.nix | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 40e69f8c9bc..82083d8fa09 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -26,13 +26,13 @@ still shows most of the available features is in `./gwenview.nix`.
*/
{
- lib, libsForQt5, fetchurl,
+ lib, libsForQt5, fetchurl, fetchFromGitHub,
okteta
}:
let
mirror = "mirror://kde";
- srcs = import ./srcs.nix { inherit fetchurl mirror; };
+ srcs = import ./srcs.nix { inherit fetchurl fetchFromGitHub mirror; };
mkDerivation = args:
let
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 8d199a291c4..769b52f2054 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -1,5 +1,5 @@
# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
-{ fetchurl, mirror }:
+{ fetchurl, fetchFromGitHub, mirror }:
{
akonadi = {
@@ -1051,11 +1051,12 @@
};
};
konsole = {
- version = "19.08.3";
- src = fetchurl {
- url = "${mirror}/stable/applications/19.08.3/src/konsole-19.08.3.tar.xz";
- sha256 = "2cc610109ff8ddc6efa6ea83f0153f4b1d72e4be65d8dbde9cfd526c257e7025";
- name = "konsole-19.08.3.tar.xz";
+ version = "unstable-2019-12-18";
+ src = fetchFromGitHub {
+ owner = "KDE";
+ repo = "konsole";
+ rev = "4444f288940184c479f5d9aad17b718f702a3ce9";
+ sha256 = "0lwhl7fab2rpiw6nh606s7l8flfqf6n39afvna6pfl0zx7z8cqgm";
};
};
kontact = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab75e4dca42..5f2d6fc10c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19635,7 +19635,7 @@ in
let
mkApplications = import ../applications/kde;
attrs = {
- inherit lib libsForQt5 fetchurl;
+ inherit lib libsForQt5 fetchurl fetchFromGitHub;
inherit okteta;
};
in
--
2.24.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment