Merge pull request #259479 from onemoresuza/libtickit

libtickit: refactor derivation
This commit is contained in:
Peder Bergebakken Sundt 2023-11-07 17:19:46 +02:00 committed by GitHub
commit 223c8a6ed4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 7 deletions

View File

@ -7,9 +7,12 @@
, libtermkey , libtermkey
, unibilium , unibilium
}: }:
stdenv.mkDerivation rec { let
pname = "libtickit";
version = "0.4.3"; version = "0.4.3";
in
stdenv.mkDerivation {
pname = "libtickit";
inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "leonerd"; owner = "leonerd";
@ -18,25 +21,33 @@ stdenv.mkDerivation rec {
hash = "sha256-QCrym8g5J1qwsFpU/PB8zZIWdM3YzOySknISSbQE4Sc="; hash = "sha256-QCrym8g5J1qwsFpU/PB8zZIWdM3YzOySknISSbQE4Sc=";
}; };
makeFlags = [ patches = [
"PREFIX=$(out)" # Disabled on darwin, since test assumes TERM=linux
"LIBTOOL=${lib.getExe libtool}" ./001-skip-test-18term-builder-on-macos.patch
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
libtool libtool
]; ];
buildInputs = [ buildInputs = [
libtermkey libtermkey
unibilium unibilium
]; ];
nativeCheckInputs = [ perl ]; nativeCheckInputs = [ perl ];
patches = [ makeFlags = [
./skipTestMacOS.patch "LIBTOOL=${lib.getExe libtool}"
]; ];
installFlags = [
"PREFIX=${placeholder "out"}"
];
enableParallelBuilding = true;
doCheck = true; doCheck = true;
meta = with lib; { meta = with lib; {