diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:36 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:47 +0000 |
| commit | 36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2 (patch) | |
| tree | b3faaf573407b32aa645237a4d16b82778a39a92 /nixpkgs/pkgs/development/libraries/libtsm | |
| parent | 4e31070265257dc67d120c27e0f75c2344fdfa9a (diff) | |
| parent | abf060725d7614bd3b9f96764262dfbc2f9c2199 (diff) | |
| download | nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.gz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.bz2 nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.lz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.xz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.zst nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.zip | |
Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libtsm')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libtsm/darwin.patch | 37 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libtsm/default.nix | 27 |
2 files changed, 64 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libtsm/darwin.patch b/nixpkgs/pkgs/development/libraries/libtsm/darwin.patch new file mode 100644 index 000000000000..d447be456e0e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libtsm/darwin.patch @@ -0,0 +1,37 @@ +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) diff --git a/nixpkgs/pkgs/development/libraries/libtsm/default.nix b/nixpkgs/pkgs/development/libraries/libtsm/default.nix new file mode 100644 index 000000000000..18ceb5302292 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libtsm/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "libtsm-3"; + + src = fetchurl { + url = "https://freedesktop.org/software/kmscon/releases/${name}.tar.xz"; + sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxkbcommon ] ++ lib.optionals stdenv.isDarwin [ + autoreconfHook + ]; + + configureFlags = [ "--disable-debug" ]; + + patches = lib.optional stdenv.isDarwin ./darwin.patch; + + meta = with lib; { + description = "Terminal-emulator State Machine"; + homepage = http://www.freedesktop.org/wiki/Software/kmscon/libtsm/; + license = licenses.mit; + maintainers = with maintainers; [ cstrahan ]; + platforms = with platforms; unix; + }; +} |