Commit c1233277 authored by ccicnce113424's avatar ccicnce113424
Browse files

kmscon: 9.0.0-unstable-2025-01-09 -> 9.3.0

parent c4cce6cb
Loading
Loading
Loading
Loading
+13 −15
Original line number Diff line number Diff line
@@ -10,24 +10,25 @@
  libGLU,
  libGL,
  pango,
  pixman,
  pkg-config,
  docbook_xsl,
  libxslt,
  libgbm,
  ninja,
  check,
  bash,
  buildPackages,
  nix-update-script,
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
  pname = "kmscon";
  version = "9.0.0-unstable-2025-01-09";
  version = "9.3.0";

  src = fetchFromGitHub {
    owner = "Aetf";
    owner = "kmscon";
    repo = "kmscon";
    rev = "a81941f4464e6f9cee75bfb8a1db88c253ede33d";
    sha256 = "sha256-l7Prt7CsYi4VCnp9xktvqqNT+4djSdO2GvP1JdxhNSI=";
    tag = "v${finalAttrs.version}";
    hash = "sha256-vdM/3n3Y2FM+PLDgVuU10kkNLCSzTrFI35CaY5NxWks=";
  };

  strictDeps = true;
@@ -43,10 +44,11 @@ stdenv.mkDerivation {
    libtsm
    libxkbcommon
    pango
    pixman
    systemdLibs
    libgbm
    check
    # Needed for autoPatchShebangs when strictDeps = true
    bash
  ];

  nativeBuildInputs = [
@@ -57,22 +59,18 @@ stdenv.mkDerivation {
    libxslt # xsltproc
  ];

  env.NIX_CFLAGS_COMPILE =
    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
  ];

  passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };

  meta = {
    description = "KMS/DRM based System Console";
    mainProgram = "kmscon";
    homepage = "https://www.freedesktop.org/wiki/Software/kmscon/";
    license = lib.licenses.mit;
    maintainers = [ ];
    maintainers = with lib.maintainers; [ ccicnce113424 ];
    platforms = lib.platforms.linux;
  };
}
})
+2 −14
Original line number Diff line number Diff line
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
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: get_option('libdir') / 'systemd/system')
-systemdsystemunitdir = systemd_deps.get_variable('systemdsystemunitdir', default_value: 'lib/systemd/system')
+systemdsystemunitdir = get_option('libdir') / 'systemd'
 
 #
 # Required dependencies
-- 
2.47.2