From f2938bf6ae5aeb27e8c9061097c66e4a8e90b39c Mon Sep 17 00:00:00 2001 From: Gustavo Coutinho de Souza Date: Fri, 6 Oct 2023 20:08:35 -0300 Subject: [PATCH] libtickit: refactor derivation 1. Use `let in` statement instead of `rec` keyword; 2. enable parallel building; 3. rename patch file; --- ...1-skip-test-18term-builder-on-macos.patch} | 0 .../libraries/libtickit/default.nix | 25 +++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) rename pkgs/development/libraries/libtickit/{skipTestMacOS.patch => 001-skip-test-18term-builder-on-macos.patch} (100%) diff --git a/pkgs/development/libraries/libtickit/skipTestMacOS.patch b/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch similarity index 100% rename from pkgs/development/libraries/libtickit/skipTestMacOS.patch rename to pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch diff --git a/pkgs/development/libraries/libtickit/default.nix b/pkgs/development/libraries/libtickit/default.nix index 4b5296c89566..54386e57a0ac 100644 --- a/pkgs/development/libraries/libtickit/default.nix +++ b/pkgs/development/libraries/libtickit/default.nix @@ -7,9 +7,12 @@ , libtermkey , unibilium }: -stdenv.mkDerivation rec { - pname = "libtickit"; +let version = "0.4.3"; +in +stdenv.mkDerivation { + pname = "libtickit"; + inherit version; src = fetchFromGitHub { owner = "leonerd"; @@ -18,25 +21,33 @@ stdenv.mkDerivation rec { hash = "sha256-QCrym8g5J1qwsFpU/PB8zZIWdM3YzOySknISSbQE4Sc="; }; - makeFlags = [ - "PREFIX=$(out)" - "LIBTOOL=${lib.getExe libtool}" + patches = [ + # Disabled on darwin, since test assumes TERM=linux + ./001-skip-test-18term-builder-on-macos.patch ]; nativeBuildInputs = [ pkg-config libtool ]; + buildInputs = [ libtermkey unibilium ]; + nativeCheckInputs = [ perl ]; - patches = [ - ./skipTestMacOS.patch + makeFlags = [ + "LIBTOOL=${lib.getExe libtool}" ]; + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + enableParallelBuilding = true; + doCheck = true; meta = with lib; {