about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/libtickit
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libtickit')
-rw-r--r--nixpkgs/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch (renamed from nixpkgs/pkgs/development/libraries/libtickit/skipTestMacOS.patch)0
-rw-r--r--nixpkgs/pkgs/development/libraries/libtickit/default.nix25
2 files changed, 18 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libtickit/skipTestMacOS.patch b/nixpkgs/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch
index 3ecdf75f06f8..3ecdf75f06f8 100644
--- a/nixpkgs/pkgs/development/libraries/libtickit/skipTestMacOS.patch
+++ b/nixpkgs/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch
diff --git a/nixpkgs/pkgs/development/libraries/libtickit/default.nix b/nixpkgs/pkgs/development/libraries/libtickit/default.nix
index 4b5296c89566..54386e57a0ac 100644
--- a/nixpkgs/pkgs/development/libraries/libtickit/default.nix
+++ b/nixpkgs/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; {