pyrox.dev
Merge pull request #171923 from trofi/update-bicon
bicon: unstable-2018-09-10 -> unstable-2020-06-04
+21
-10
pkgs/applications/misc/bicon/default.nix
+21
-10
pkgs/applications/misc/bicon/default.nix
···
1
1
{ lib, stdenv
2
-
, fetchFromGitHub
3
-
, autoreconfHook
4
-
, pkg-config
5
-
, perl
6
-
, fribidi
7
-
, kbd
8
-
, xkbutils
2
+
, fetchFromGitHub
3
+
, fetchpatch
4
+
, autoreconfHook
5
+
, pkg-config
6
+
, perl
7
+
, fribidi
8
+
, kbd
9
+
, xkbutils
9
10
}:
10
11
11
12
stdenv.mkDerivation rec {
12
13
pname = "bicon";
13
-
version = "unstable-2018-09-10";
14
+
version = "unstable-2020-06-04";
14
15
15
16
src = fetchFromGitHub {
16
17
owner = "behdad";
17
18
repo = pname;
18
-
rev = "38725c062a83ab19c4e4b4bc20eb9535561aa76c";
19
-
sha256 = "0hdslrci8pq300f3rrjsvl5psfrxdwyxf9g2m5g789sr049dksnq";
19
+
rev = "64ae10c94b94a573735a2c2b1502334b86d3b1f7";
20
+
sha256 = "0ixsf65j4dbdl2aazjc2j0hiagbp6svvfwfmyivha0i1k5yx12v1";
20
21
};
22
+
23
+
patches = [
24
+
# Fix build on clang-13. Pull the change pending upstream
25
+
# inclusion: https://github.com/behdad/bicon/pull/29
26
+
(fetchpatch {
27
+
name = "clang.patch";
28
+
url = "https://github.com/behdad/bicon/commit/20f5a79571f222f96e07d7c0c5e76e2c9ff1c59a.patch";
29
+
sha256 = "0l1dm7w52k57nv3lvz5pkbwp021mlsk3csyalxi90np1lx5sqbd1";
30
+
})
31
+
];
21
32
22
33
buildInputs = [ fribidi kbd xkbutils perl ];
23
34
nativeBuildInputs = [ autoreconfHook pkg-config ];