diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
| commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
| tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/development/libraries/libtickit | |
| parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
| parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
| download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libtickit')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libtickit/default.nix | 20 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libtickit/skipTestMacOS.patch | 27 |
2 files changed, 44 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libtickit/default.nix b/nixpkgs/pkgs/development/libraries/libtickit/default.nix index 782a5ae486c1..4b5296c89566 100644 --- a/nixpkgs/pkgs/development/libraries/libtickit/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtickit/default.nix @@ -2,9 +2,10 @@ , stdenv , fetchFromGitHub , pkg-config +, libtool +, perl , libtermkey , unibilium -, libtool }: stdenv.mkDerivation rec { pname = "libtickit"; @@ -22,8 +23,21 @@ stdenv.mkDerivation rec { "LIBTOOL=${lib.getExe libtool}" ]; - nativeBuildInputs = [ pkg-config libtool ]; - buildInputs = [ libtermkey unibilium ]; + nativeBuildInputs = [ + pkg-config + libtool + ]; + buildInputs = [ + libtermkey + unibilium + ]; + nativeCheckInputs = [ perl ]; + + patches = [ + ./skipTestMacOS.patch + ]; + + doCheck = true; meta = with lib; { description = "A terminal interface construction kit"; diff --git a/nixpkgs/pkgs/development/libraries/libtickit/skipTestMacOS.patch b/nixpkgs/pkgs/development/libraries/libtickit/skipTestMacOS.patch new file mode 100644 index 000000000000..3ecdf75f06f8 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libtickit/skipTestMacOS.patch @@ -0,0 +1,27 @@ +From 6179359c0b9247ae981b8b2a2897eabc921147fd Mon Sep 17 00:00:00 2001 +From: Gustavo Coutinho de Souza <dev@onemoresuza.mailer.me> +Date: Tue, 8 Aug 2023 15:45:43 -0300 +Subject: [PATCH] test: skip test 18 if on MacOS + +--- + t/18term-builder.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/t/18term-builder.c b/t/18term-builder.c +index 8b23ab4..c1b64a2 100644 +--- a/t/18term-builder.c ++++ b/t/18term-builder.c +@@ -21,6 +21,11 @@ static void output(TickitTerm *tt, const char *bytes, size_t len, void *user) + + int main(int argc, char *argv[]) + { ++ ++ #if defined(__APPLE__) || defined(__MACH__) ++ skip_all("the test does not seem to work on MacOS"); ++ return exit_status(); ++ #endif + // getstr override + { + /* We need a termtype that isn't xterm, but that will actually load. +-- +2.41.0 |