libtsm: 3 -> 4.0.1
This commit is contained in:
parent
840c782d50
commit
c94378d121
@ -1,37 +0,0 @@
|
||||
From 4e7b7b1124bfbccb43820997164b00720bf5ca31 Mon Sep 17 00:00:00 2001
|
||||
From: Florian Gilcher <florian.gilcher@asquera.de>
|
||||
Date: Sun, 23 Mar 2014 23:05:44 +0100
|
||||
Subject: [PATCH] Remove GCC specific flags
|
||||
|
||||
---
|
||||
Makefile.am | 10 ++--------
|
||||
1 file changed, 2 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index f1e872b..c011f02 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -69,11 +69,7 @@ AM_CFLAGS = \
|
||||
AM_CPPFLAGS = \
|
||||
-include $(top_builddir)/config.h \
|
||||
-I $(srcdir)/src
|
||||
-AM_LDFLAGS = \
|
||||
- -Wl,--as-needed \
|
||||
- -Wl,--gc-sections \
|
||||
- -Wl,-z,relro \
|
||||
- -Wl,-z,now
|
||||
+AM_LDFLAGS =
|
||||
|
||||
if BUILD_ENABLE_DEBUG
|
||||
AM_CFLAGS += -g
|
||||
@@ -134,9 +130,7 @@ libtsm_la_CPPFLAGS = $(AM_CPPFLAGS)
|
||||
libtsm_la_LIBADD = libshl.la
|
||||
EXTRA_libtsm_la_DEPENDENCIES = $(top_srcdir)/docs/libtsm.sym
|
||||
libtsm_la_LDFLAGS = \
|
||||
- $(AM_LDFLAGS) \
|
||||
- -version-info $(LIBTSM_CURRENT):$(LIBTSM_REVISION):$(LIBTSM_AGE) \
|
||||
- -Wl,--version-script="$(top_srcdir)/docs/libtsm.sym"
|
||||
+ $(AM_LDFLAGS)
|
||||
|
||||
if BUILD_HAVE_XKBCOMMON
|
||||
libtsm_la_CPPFLAGS += $(XKBCOMMON_CFLAGS)
|
@ -1,23 +1,21 @@
|
||||
{ stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoreconfHook }:
|
||||
{ stdenv, fetchFromGitHub, libxkbcommon, pkgconfig, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libtsm-3";
|
||||
pname = "libtsm";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://freedesktop.org/software/kmscon/releases/${name}.tar.xz";
|
||||
sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aetf";
|
||||
repo = "libtsm";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mwn91i5h5d518i1s05y7hzv6bc13vzcvxszpfh77473iwg4wprx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ libxkbcommon ] ++ lib.optionals stdenv.isDarwin [
|
||||
autoreconfHook
|
||||
];
|
||||
buildInputs = [ libxkbcommon ];
|
||||
|
||||
configureFlags = [ "--disable-debug" ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
patches = lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
|
||||
meta = with lib; {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Terminal-emulator State Machine";
|
||||
homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/";
|
||||
license = licenses.mit;
|
||||
|
Loading…
Reference in New Issue
Block a user