From 5cf107a7219ab9374645a4bb479198b5e75bb1fa Mon Sep 17 00:00:00 2001
From: hustlerone <nine-ball@tutanota.com>
Date: Thu, 20 Feb 2025 15:04:18 +0100
Subject: [PATCH 1/2] pkgs/libtsm: bump version to latest

---
 pkgs/by-name/li/libtsm/package.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/li/libtsm/package.nix b/pkgs/by-name/li/libtsm/package.nix
index 9de5e44acad6..c67ff95e8034 100644
--- a/pkgs/by-name/li/libtsm/package.nix
+++ b/pkgs/by-name/li/libtsm/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libtsm";
-  version = "4.0.2";
+  version = "4.0.2-unstable-2023-12-24";
 
   src = fetchFromGitHub {
     owner = "Aetf";
     repo = "libtsm";
-    rev = "v${version}";
-    sha256 = "sha256-BYMRPjGRVSnYzkdbxypkuE0YkeVLPJ32iGZ1b0R6wto=";
+    rev = "69922bde02c7af83b4d48a414cc6036af7388626";
+    sha256 = "sha256-Rug3OWSbbiIivItULPNNptClIZ/PrXdQeUypAAxrUY8=";
   };
 
   buildInputs = [ libxkbcommon ];
@@ -25,13 +25,6 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  # https://github.com/Aetf/libtsm/issues/20
-  postPatch = ''
-    substituteInPlace etc/libtsm.pc.in \
-      --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
-      --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
-  '';
-
   meta = with lib; {
     description = "Terminal-emulator State Machine";
     homepage = "https://www.freedesktop.org/wiki/Software/kmscon/libtsm/";

From 71aecd746796ec29beb4a071a40ddda2a18d9dd4 Mon Sep 17 00:00:00 2001
From: hustlerone <nine-ball@tutanota.com>
Date: Thu, 20 Feb 2025 15:10:12 +0100
Subject: [PATCH 2/2] pkgs/ksmcon: bump version

---
 pkgs/by-name/km/kmscon/package.nix   | 43 +++++++++-------------------
 pkgs/by-name/km/kmscon/sandbox.patch | 25 ++++++++++++++++
 2 files changed, 38 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/by-name/km/kmscon/sandbox.patch

diff --git a/pkgs/by-name/km/kmscon/package.nix b/pkgs/by-name/km/kmscon/package.nix
index eca939914d9a..ecdb3f485189 100644
--- a/pkgs/by-name/km/kmscon/package.nix
+++ b/pkgs/by-name/km/kmscon/package.nix
@@ -5,7 +5,7 @@
   fetchpatch,
   meson,
   libtsm,
-  systemd,
+  systemdLibs,
   libxkbcommon,
   libdrm,
   libGLU,
@@ -17,18 +17,18 @@
   libxslt,
   libgbm,
   ninja,
+  check,
   buildPackages,
 }:
-
 stdenv.mkDerivation rec {
   pname = "kmscon";
-  version = "9.0.0";
+  version = "9.0.0-unstable-2025-01-09";
 
   src = fetchFromGitHub {
     owner = "Aetf";
     repo = "kmscon";
-    rev = "v${version}";
-    sha256 = "sha256-8owyyzCrZVbWXcCR+RA+m0MOrdzW+efI+rIMWEVEZ1o=";
+    rev = "a81941f4464e6f9cee75bfb8a1db88c253ede33d";
+    sha256 = "sha256-l7Prt7CsYi4VCnp9xktvqqNT+4djSdO2GvP1JdxhNSI=";
   };
 
   strictDeps = true;
@@ -45,8 +45,9 @@ stdenv.mkDerivation rec {
     libxkbcommon
     pango
     pixman
-    systemd
+    systemdLibs
     libgbm
+    check
   ];
 
   nativeBuildInputs = [
@@ -57,34 +58,16 @@ stdenv.mkDerivation rec {
     libxslt # xsltproc
   ];
 
-  # Remove the patches attrlist once the package is bumped to something newer than both of these patches
-  patches = [
-    (fetchpatch {
-      name = "0001-tests-fix-warnings.patch";
-      url = "https://github.com/Aetf/kmscon/commit/b65f4269b03de580923ab390bde795e7956b633f.patch";
-      sha256 = "sha256-ngflPwmNMM/2JzhV+hHiH3efQyoSULfqEywzWox9iAQ=";
-    })
-    (fetchpatch {
-      # https://github.com/Aetf/kmscon/pull/96
-      name = "0002-runtime-fix-logout.patch";
-      url = "https://github.com/Aetf/kmscon/commit/a81941f4464e6f9cee75bfb8a1db88c253ede33d.patch";
-      sha256 = "sha256-geWu8MVsHKs8VHauh5Tf9eWJrdA5+0bPFAQ32T6Xsqg=";
-    })
-  ];
-
-  # _FORTIFY_SOURCE requires compiling with optimization (-O)
   env.NIX_CFLAGS_COMPILE =
-    lib.optionalString stdenv.cc.isGNU "-O" + " -Wno-error=maybe-uninitialized"; # https://github.com/Aetf/kmscon/issues/49
-
-  configureFlags = [
-    "--enable-multi-seat"
-    "--disable-debug"
-    "--enable-optimizations"
-    "--with-renderers=bbulk,gltex,pixman"
-  ];
+    lib.optionalString stdenv.cc.isGNU "-O "
+    + "-Wno-error=maybe-uninitialized -Wno-error=unused-result -Wno-error=implicit-function-declaration";
 
   enableParallelBuilding = true;
 
+  patches = [
+    ./sandbox.patch # Generate system units where they should be (nix store) instead of /etc/systemd/system
+  ];
+
   meta = with lib; {
     description = "KMS/DRM based System Console";
     mainProgram = "kmscon";
diff --git a/pkgs/by-name/km/kmscon/sandbox.patch b/pkgs/by-name/km/kmscon/sandbox.patch
new file mode 100644
index 000000000000..e70d0da80a19
--- /dev/null
+++ b/pkgs/by-name/km/kmscon/sandbox.patch
@@ -0,0 +1,25 @@
+From d51e35a7ab936983b2a544992adae66093c6028f Mon Sep 17 00:00:00 2001
+From: hustlerone <nine-ball@tutanota.com>
+Date: Thu, 20 Feb 2025 11:05:56 +0100
+Subject: [PATCH] Patch for nixpkgs
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 964b44b..4415084 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: get_option('libdir') / 'systemd/system')
++systemdsystemunitdir = get_option('libdir') / 'systemd'
+ 
+ #
+ # Required dependencies
+-- 
+2.47.2
+