mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
kmscon: 9.3.5 -> 10.0.0
This commit is contained in:
@@ -16,8 +16,11 @@
|
||||
pkg-config,
|
||||
docbook_xsl,
|
||||
docbook_xml_dtd_42,
|
||||
python3,
|
||||
ncurses,
|
||||
libxslt,
|
||||
libgbm,
|
||||
seatd,
|
||||
ninja,
|
||||
check,
|
||||
bash,
|
||||
@@ -29,13 +32,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kmscon";
|
||||
version = "9.3.5";
|
||||
version = "10.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kmscon";
|
||||
repo = "kmscon";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QBN1rSDmwVg7cgljhe6kVIg/xLoolmOPqS8JXZuQiXs=";
|
||||
hash = "sha256-M3830e1GzzLT2fhheWwNRkURzYkHv4k8uEMoCqKkjJY=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -57,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pango
|
||||
systemdLibs
|
||||
libgbm
|
||||
seatd
|
||||
check
|
||||
# Needed for autoPatchShebangs when strictDeps = true
|
||||
bash
|
||||
@@ -69,6 +73,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pkg-config
|
||||
libxslt # xsltproc
|
||||
docbook_xml_dtd_42
|
||||
python3
|
||||
ncurses
|
||||
];
|
||||
|
||||
outputs = [
|
||||
@@ -76,9 +82,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"man"
|
||||
];
|
||||
|
||||
patches = [
|
||||
./sandbox.patch # Generate system units where they should be (nix store) instead of /etc/systemd/system
|
||||
];
|
||||
env = {
|
||||
PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
|
||||
DESTDIR = "/";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs scripts/terminfo
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $out/bin/kmscon \
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index de29a32..e731bbd 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -39,7 +39,7 @@ mandir = get_option('mandir')
|
||||
moduledir = get_option('libdir') / meson.project_name()
|
||||
|
||||
systemd_deps = dependency('systemd', required: false)
|
||||
-systemdsystemunitdir = systemd_deps.get_variable('systemdsystemunitdir', default_value: 'lib/systemd/system')
|
||||
+systemdsystemunitdir = get_option('libdir') / 'systemd' / 'system'
|
||||
|
||||
#
|
||||
# Required dependencies
|
||||
Reference in New Issue
Block a user