Merge pull request #177746 from raboof/init-xlogo-1.0.5

xlogo: init at 1.0.5
main
Sandro 2 years ago committed by GitHub
commit 8e57c30fb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 29
      pkgs/development/tools/misc/xorg-autoconf/default.nix
  2. 36
      pkgs/tools/X11/xlogo/default.nix
  3. 4
      pkgs/top-level/all-packages.nix

@ -0,0 +1,29 @@
{ lib
, stdenv
, autoreconfHook
, fetchFromGitLab
}:
stdenv.mkDerivation rec {
pname = "xorg-autoconf";
version = "1.19.3";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
group = "xorg";
owner = "util";
repo = "macros";
rev = "util-macros-${version}";
sha256 = "sha256-+yEMCjLztdY5LKTNjfhudDS0fdaOj4LKZ3YL5witFR4=";
};
nativeBuildInputs = [ autoreconfHook ];
meta = with lib; {
description = "GNU autoconf macros shared across X.Org projects";
homepage = "https://gitlab.freedesktop.org/xorg/util/macros";
maintainers = with maintainers; [ raboof ];
license = licenses.mit;
platforms = platforms.unix;
};
}

@ -0,0 +1,36 @@
{ lib
, stdenv
, fetchFromGitLab
, xorg
, autoreconfHook
, pkg-config
, xorg-autoconf
}:
stdenv.mkDerivation rec {
pname = "xlogo";
version = "1.0.5";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
group = "xorg";
owner = "app";
repo = "xlogo";
rev = "refs/tags/xlogo-${version}";
hash = "sha256-AyNFzRZtbCKkGacBCaGZZkLRTAGq5TrA2OXGqwoKq24=";
};
nativeBuildInputs = [ xorg-autoconf autoreconfHook pkg-config ];
configureFlags = [ "--with-appdefaultdir=$out/share/X11/app-defaults" ];
buildInputs = [ xorg.libX11 xorg.libXext xorg.libSM xorg.libXmu xorg.libXaw xorg.libXt ];
meta = with lib; {
description = "X Window System logo display demo";
homepage = "https://gitlab.freedesktop.org/xorg/app/xlogo";
maintainers = with maintainers; [ raboof ];
platforms = platforms.unix;
license = licenses.mit;
};
}

@ -4367,6 +4367,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
xlogo = callPackage ../tools/X11/xlogo { };
xmlbeans = callPackage ../tools/misc/xmlbeans { };
xmlsort = perlPackages.XMLFilterSort;
@ -22847,6 +22849,8 @@ with pkgs;
or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin
}) // { inherit xlibsWrapper; } );
xorg-autoconf = callPackage ../development/tools/misc/xorg-autoconf { };
xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };
yaws = callPackage ../servers/http/yaws {

Loading…
Cancel
Save