Commit 0fe34590 authored by Weijia Wang's avatar Weijia Wang
Browse files

x11basic: 1.27 -> 1.28-65

parent 8b50aa2f
Loading
Loading
Loading
Loading
+22 −15
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchFromGitHub,
  automake,
  autoconf,
  fetchFromGitea,
  autoreconfHook,
  fig2dev,
  readline,
  libX11,
  bluez,
@@ -11,19 +11,28 @@
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "X11basic";
  version = "1.27";

  src = fetchFromGitHub {
    owner = "kollokollo";
    repo = "X11basic";
    rev = finalAttrs.version;
    sha256 = "1hpxzdqnjl1fiwgs2vrjg4kxm29c7pqwk3g1m4p5pm4x33a3d1q2";
  pname = "x11basic";
  version = "1.28-65";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "kollo";
    repo = "X11Basic";
    tag = finalAttrs.version;
    hash = "sha256-07sRUFKJ4CYMtQhRu18PElvNQN2DyKkRJUt7oIhenkA=";
  };

  sourceRoot = "${finalAttrs.src.name}/src";

  postPatch = ''
    chmod -R u+w examples/compiler
    substituteInPlace configure.in \
      --replace-fail "main(foo)" "int main(int foo)"
  '';

  nativeBuildInputs = [
    autoconf
    automake
    autoreconfHook
    fig2dev
  ];

  buildInputs = [
@@ -33,8 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
    bluez
  ];

  preConfigure = "cd src;autoconf";

  configureFlags = [
    "--with-bluetooth"
    "--with-usb"
+0 −4
Original line number Diff line number Diff line
@@ -13515,10 +13515,6 @@ with pkgs;

  wsjtx = qt5.callPackage ../applications/radio/wsjtx { };

  x11basic = callPackage ../by-name/x1/x11basic/package.nix {
    autoconf = buildPackages.autoconf269;
  };

  x2goclient = callPackage ../applications/networking/remote/x2goclient { };

  x2gokdriveclient = libsForQt5.callPackage ../applications/networking/remote/x2gokdriveclient { };