pyrox.dev
Merge pull request #287973 from omgbebebe/gxkb_update
gxkb: 0.9.3 -> 0.9.5
authored by Peder Bergebakken Sundt and committed by GitHub de660499 0c6ae8aa
+15
-3
pkgs/applications/misc/gxkb/default.nix
+15
-3
pkgs/applications/misc/gxkb/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3, libwnck, libxklavier
2
, appindicatorSupport ? true, libayatana-appindicator
3
}:
4
5
stdenv.mkDerivation rec {
6
pname = "gxkb";
7
-
version = "0.9.3";
8
9
src = fetchFromGitHub {
10
owner = "zen-tools";
11
repo = "gxkb";
12
rev = "v${version}";
13
-
sha256 = "sha256-9r1eZl7PgIt2ZpK+QQHaa460imIHT3Lh5mpzcFglyWc=";
14
};
15
16
nativeBuildInputs = [ pkg-config autoreconfHook ];
···
18
19
configureFlags = lib.optional appindicatorSupport "--enable-appindicator=yes";
20
outputs = [ "out" "man" ];
21
22
meta = with lib; {
23
description = "X11 keyboard indicator and switcher";
···
1
+
{ lib, stdenv, fetchFromGitHub, fetchurl, git, autoreconfHook, pkg-config, gtk3, libwnck, libxklavier
2
, appindicatorSupport ? true, libayatana-appindicator
3
}:
4
5
stdenv.mkDerivation rec {
6
pname = "gxkb";
7
+
version = "0.9.5";
8
9
src = fetchFromGitHub {
10
owner = "zen-tools";
11
repo = "gxkb";
12
rev = "v${version}";
13
+
sha256 = "sha256-oBIBIkj4p6HlF0PRQtI/K5dhLs7pbPxN7Cgr/YZaI1s=";
14
};
15
16
nativeBuildInputs = [ pkg-config autoreconfHook ];
···
18
19
configureFlags = lib.optional appindicatorSupport "--enable-appindicator=yes";
20
outputs = [ "out" "man" ];
21
+
22
+
# This patch restore data which was wiped by upstream without any technical reasons
23
+
# https://github.com/omgbebebe/gxkb/commit/727ec8b595a91dbb540e6087750f43b85d0dfbc0
24
+
# NOTE: the `patch` hook cannot be used here due to lack of support for git binary patches
25
+
p1 = fetchurl {
26
+
url = "https://github.com/omgbebebe/gxkb/commit/727ec8b595a91dbb540e6087750f43b85d0dfbc0.patch";
27
+
hash = "sha256-x7x3MHHrOnPivvlzOFqgFAA5BDB2LOXMlalPYbwM/1Q=";
28
+
};
29
+
30
+
postPatch = ''
31
+
${git}/bin/git apply ${p1}
32
+
'';
33
34
meta = with lib; {
35
description = "X11 keyboard indicator and switcher";