diff options
| author | Charles Strahan <charles.c.strahan@gmail.com> | 2015-06-25 21:06:55 -0500 |
|---|---|---|
| committer | Charles Strahan <charles.c.strahan@gmail.com> | 2015-06-25 21:06:55 -0500 |
| commit | d51a81690ca014d97153b688aa6ec89ace4ce321 (patch) | |
| tree | 32b952ff6a6d123f6f835b24e14668ce0de4b3be /pkgs/development/libraries/libtsm | |
| parent | 61fdf5b7581db33ae61e8646b2714ad266541a1a (diff) | |
| download | nixpkgs-d51a81690ca014d97153b688aa6ec89ace4ce321.tar nixpkgs-d51a81690ca014d97153b688aa6ec89ace4ce321.tar.gz nixpkgs-d51a81690ca014d97153b688aa6ec89ace4ce321.tar.bz2 nixpkgs-d51a81690ca014d97153b688aa6ec89ace4ce321.tar.lz nixpkgs-d51a81690ca014d97153b688aa6ec89ace4ce321.tar.xz nixpkgs-d51a81690ca014d97153b688aa6ec89ace4ce321.tar.zst nixpkgs-d51a81690ca014d97153b688aa6ec89ace4ce321.zip | |
libtsm: fix building with clang for darwin
Diffstat (limited to 'pkgs/development/libraries/libtsm')
| -rw-r--r-- | pkgs/development/libraries/libtsm/darwin.patch | 37 | ||||
| -rw-r--r-- | pkgs/development/libraries/libtsm/default.nix | 18 |
2 files changed, 50 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libtsm/darwin.patch b/pkgs/development/libraries/libtsm/darwin.patch new file mode 100644 index 00000000000..d447be456e0 --- /dev/null +++ b/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/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 66e1698b11d..febdb0914d6 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxkbcommon, pkgconfig }: +{ stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoconf, automake }: stdenv.mkDerivation rec { name = "libtsm-3"; @@ -8,14 +8,22 @@ stdenv.mkDerivation rec { sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i"; }; - buildInputs = [ libxkbcommon pkgconfig ]; + buildInputs = [ libxkbcommon pkgconfig ] ++ lib.optionals stdenv.isDarwin [ + autoconf automake + ]; + + preConfigure = lib.optionalString stdenv.isDarwin '' + aclocal + ''; configureFlags = [ "--disable-debug" ]; - meta = { + 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 = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.shlevy ]; + license = licenses.mit; + maintainers = with maintainers; [ shlevy cstrahan ]; }; } |