Unverified Commit 69d335c7 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

arcan: 0.7.0.1 -> 0.7.1 (#474538)

parents 753ca2df 8b67122f
Loading
Loading
Loading
Loading
+0 −12
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@
  callPackage,
  cmake,
  espeak-ng,
  fetchpatch2,
  ffmpeg,
  file,
  freetype,
@@ -164,17 +163,6 @@ stdenv.mkDerivation (finalAttrs: {
      popd
    '';

  patches = [
    # Upstream patch to support ffmpeg 8
    (fetchpatch2 {
      name = "0001-build-fix-build-with-latest-ffmpeg.patch";
      url = "https://chiselapp.com/user/letoram/repository/arcan/vpatch?from=cc6f24de2134282a&to=25bbde5eec7033d3";
      hash = "sha256-i8d/X/xmEGWpO9fG6BerW//JnosPwDolXvMFsuv39IM=";
      stripLen = 1;
      extraPrefix = "src/";
    })
  ];

  postPatch = ''
    substituteInPlace ./src/platform/posix/paths.c \
      --replace-fail "/usr/bin" "$out/bin" \
+5 −3
Original line number Diff line number Diff line
{
  fetchFromGitHub,
  fetchFromGitea,
}:

{
@@ -7,13 +8,14 @@
    let
      self = {
        pname = "arcan";
        version = "0.7.0.1";
        version = "0.7.1";

        src = fetchFromGitHub {
        src = fetchFromGitea {
          domain = "codeberg.org";
          owner = "letoram";
          repo = "arcan";
          tag = self.version;
          hash = "sha256-AbIMZOyEvRQzlmNetImLnBBoSaFUsy4k1NNSO0mI8FI=";
          hash = "sha256-rADO6xLkUa3iIOSOR96fr1mR7wAUJpsSPoVn+CTNyOo=";
        };
      };
    in
+6 −5
Original line number Diff line number Diff line
{
  lib,
  fetchFromGitHub,
  fetchFromGitea,
  stdenvNoCC,
}:

stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "cat9";
  version = "0-unstable-2024-06-17";
  version = "0-unstable-2025-12-26";

  src = fetchFromGitHub {
  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "letoram";
    repo = "cat9";
    rev = "f00e8791c1826065d4a93ace12e55ab5732d17a7";
    hash = "sha256-xFw6r7SQK0T5j7hVK3U39U2Q/qZow6Ad/R0Cl6nqUQw=";
    rev = "8d2b30545c3e87c8f2e161d755b53c23a48bcf05";
    hash = "sha256-KSXfa7K8SxnyPmSNCXZs8C+gGYxkLRu0MFbJ3cotSEQ=";
  };

  dontConfigure = true;
+6 −5
Original line number Diff line number Diff line
{
  lib,
  stdenvNoCC,
  fetchFromGitHub,
  fetchFromGitea,
}:

stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "durden";
  version = "0-unstable-2024-06-23";
  version = "0.6.3";

  src = fetchFromGitHub {
  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "letoram";
    repo = "durden";
    rev = "dffb94b69355ffa9cda074c1d0a48af74b78c220";
    hash = "sha256-sBhlBk4vAYwedw4VerUfY80SXbVoEDid54si6qwDeXs=";
    tag = finalAttrs.version;
    hash = "sha256-dWLOLOICcVjqYTw8KAPM2/xgB9mTSEdGGIHD1WSrIvA=";
  };

  dontConfigure = true;
+8 −7
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchFromGitHub,
  fetchFromGitea,
  arcan,
  audit,
  dbus,
@@ -40,15 +40,16 @@
  unstableGitUpdater,
}:

stdenv.mkDerivation (finalPackages: {
stdenv.mkDerivation (finalPackages: rec {
  pname = "xarcan";
  version = "0-unstable-2024-08-26";
  version = "0.7.1";

  src = fetchFromGitHub {
  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "letoram";
    repo = "xarcan";
    rev = "5672116f627de492fb4df0b33d36b78041cd3931";
    hash = "sha256-xZX6uLs/H/wONKrUnYxSynHK7CL7FDfzWvSjtXxT8es=";
    tag = version;
    hash = "sha256-j20Wz/Ae4QTincAPgMoj19EfKAPxIGm0Jgmi4sUR88o=";
  };

  nativeBuildInputs = [
@@ -114,7 +115,7 @@ stdenv.mkDerivation (finalPackages: {
  passthru.updateScript = unstableGitUpdater { };

  meta = {
    homepage = "https://github.com/letoram/letoram";
    homepage = "https://codeberg.org/letoram/xarcan";
    description = "Patched Xserver that bridges connections to Arcan";
    mainProgram = "Xarcan";
    longDescription = ''