pyrox.dev
lol
pkgs/ksmcon: bump version
+38
-30
+13
-30
pkgs/by-name/km/kmscon/package.nix
+13
-30
pkgs/by-name/km/kmscon/package.nix
···
5
5
fetchpatch,
6
6
meson,
7
7
libtsm,
8
-
systemd,
8
+
systemdLibs,
9
9
libxkbcommon,
10
10
libdrm,
11
11
libGLU,
···
17
17
libxslt,
18
18
libgbm,
19
19
ninja,
20
+
check,
20
21
buildPackages,
21
22
}:
22
-
23
23
stdenv.mkDerivation rec {
24
24
pname = "kmscon";
25
-
version = "9.0.0";
25
+
version = "9.0.0-unstable-2025-01-09";
26
26
27
27
src = fetchFromGitHub {
28
28
owner = "Aetf";
29
29
repo = "kmscon";
30
-
rev = "v${version}";
31
-
sha256 = "sha256-8owyyzCrZVbWXcCR+RA+m0MOrdzW+efI+rIMWEVEZ1o=";
30
+
rev = "a81941f4464e6f9cee75bfb8a1db88c253ede33d";
31
+
sha256 = "sha256-l7Prt7CsYi4VCnp9xktvqqNT+4djSdO2GvP1JdxhNSI=";
32
32
};
33
33
34
34
strictDeps = true;
···
45
45
libxkbcommon
46
46
pango
47
47
pixman
48
-
systemd
48
+
systemdLibs
49
49
libgbm
50
+
check
50
51
];
51
52
52
53
nativeBuildInputs = [
···
57
58
libxslt # xsltproc
58
59
];
59
60
60
-
# Remove the patches attrlist once the package is bumped to something newer than both of these patches
61
-
patches = [
62
-
(fetchpatch {
63
-
name = "0001-tests-fix-warnings.patch";
64
-
url = "https://github.com/Aetf/kmscon/commit/b65f4269b03de580923ab390bde795e7956b633f.patch";
65
-
sha256 = "sha256-ngflPwmNMM/2JzhV+hHiH3efQyoSULfqEywzWox9iAQ=";
66
-
})
67
-
(fetchpatch {
68
-
# https://github.com/Aetf/kmscon/pull/96
69
-
name = "0002-runtime-fix-logout.patch";
70
-
url = "https://github.com/Aetf/kmscon/commit/a81941f4464e6f9cee75bfb8a1db88c253ede33d.patch";
71
-
sha256 = "sha256-geWu8MVsHKs8VHauh5Tf9eWJrdA5+0bPFAQ32T6Xsqg=";
72
-
})
73
-
];
61
+
env.NIX_CFLAGS_COMPILE =
62
+
lib.optionalString stdenv.cc.isGNU "-O "
63
+
+ "-Wno-error=maybe-uninitialized -Wno-error=unused-result -Wno-error=implicit-function-declaration";
74
64
75
-
# _FORTIFY_SOURCE requires compiling with optimization (-O)
76
-
env.NIX_CFLAGS_COMPILE =
77
-
lib.optionalString stdenv.cc.isGNU "-O" + " -Wno-error=maybe-uninitialized"; # https://github.com/Aetf/kmscon/issues/49
65
+
enableParallelBuilding = true;
78
66
79
-
configureFlags = [
80
-
"--enable-multi-seat"
81
-
"--disable-debug"
82
-
"--enable-optimizations"
83
-
"--with-renderers=bbulk,gltex,pixman"
67
+
patches = [
68
+
./sandbox.patch # Generate system units where they should be (nix store) instead of /etc/systemd/system
84
69
];
85
-
86
-
enableParallelBuilding = true;
87
70
88
71
meta = with lib; {
89
72
description = "KMS/DRM based System Console";
+25
pkgs/by-name/km/kmscon/sandbox.patch
+25
pkgs/by-name/km/kmscon/sandbox.patch
···
1
+
From d51e35a7ab936983b2a544992adae66093c6028f Mon Sep 17 00:00:00 2001
2
+
From: hustlerone <nine-ball@tutanota.com>
3
+
Date: Thu, 20 Feb 2025 11:05:56 +0100
4
+
Subject: [PATCH] Patch for nixpkgs
5
+
6
+
---
7
+
meson.build | 2 +-
8
+
1 file changed, 1 insertion(+), 1 deletion(-)
9
+
10
+
diff --git a/meson.build b/meson.build
11
+
index 964b44b..4415084 100644
12
+
--- a/meson.build
13
+
+++ b/meson.build
14
+
@@ -39,7 +39,7 @@ mandir = get_option('mandir')
15
+
moduledir = get_option('libdir') / meson.project_name()
16
+
17
+
systemd_deps = dependency('systemd', required: false)
18
+
-systemdsystemunitdir = systemd_deps.get_variable('systemdsystemunitdir', default_value: get_option('libdir') / 'systemd/system')
19
+
+systemdsystemunitdir = get_option('libdir') / 'systemd'
20
+
21
+
#
22
+
# Required dependencies
23
+
--
24
+
2.47.2
25
+