diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2022-05-28 04:20:00 +0000 |
---|---|---|
committer | Mario Rodas <marsam@users.noreply.github.com> | 2022-05-28 04:20:00 +0000 |
commit | 96faefe436d35a575524ab81f60324997e203e05 (patch) | |
tree | 7de162ccfea3f214f2043baaa71559e1c0d4a65a /pkgs/applications/terminal-emulators/contour | |
parent | 64da60d311b10c2106dd2e1d05b58e20c6a9a8b3 (diff) |
contour: 0.1.1 -> 0.3.1.200
Diffstat (limited to 'pkgs/applications/terminal-emulators/contour')
-rw-r--r-- | pkgs/applications/terminal-emulators/contour/default.nix | 89 |
1 files changed, 79 insertions, 10 deletions
diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index d0def97e46f3c..0794e7f2fcf8d 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -1,30 +1,99 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, freetype, libGL, pcre, nixosTests }: +{ lib +, stdenv +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, freetype +, fontconfig +, libGL +, pcre +, boost +, catch2 +, fmt +, microsoft_gsl +, range-v3 +, libyamlcpp +, ncurses +, file +, darwin +, nixosTests +}: +let + # Commits refs come from https://github.com/contour-terminal/contour/blob/master/scripts/install-deps.sh + libunicode-src = fetchFromGitHub { + owner = "contour-terminal"; + repo = "libunicode"; + rev = "c2369b6380df1197476b08d3e2d0e96b6446f776"; + sha256 = "sha256-kq7GpFCkrJG7F9/YEGz3gMTgYzhp/QB8D5b9wwMaLvQ="; + }; + + termbench-pro-src = fetchFromGitHub { + owner = "contour-terminal"; + repo = "termbench-pro"; + rev = "cd571e3cebb7c00de9168126b28852f32fb204ed"; + sha256 = "sha256-dNtOmBu63LFYfiGjXf34C2tiG8pMmsFT4yK3nBnK9WI="; + }; +in mkDerivation rec { pname = "contour"; - version = "0.1.1"; + version = "0.3.1.200"; src = fetchFromGitHub { - owner = "christianparpart"; + owner = "contour-terminal"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P7t+M75ZWjFcGWngcbaurdit6e+pb0ILljimhYqW0NI="; - fetchSubmodules = true; + sha256 = "sha256-TpxVC0GFZD3jGISnDWHKEetgVVpznm5k/Vc2dwVfSG4="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ncurses + file + ]; + + buildInputs = [ + fontconfig + freetype + libGL + pcre + boost + catch2 + fmt + microsoft_gsl + range-v3 + libyamlcpp + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.libs.utmp ]; + + preConfigure = '' + mkdir -p _deps/sources + + cat > _deps/sources/CMakeLists.txt <<EOF + macro(ContourThirdParties_Embed_libunicode) + add_subdirectory(\''${ContourThirdParties_SRCDIR}/libunicode EXCLUDE_FROM_ALL) + endmacro() + macro(ContourThirdParties_Embed_termbench_pro) + add_subdirectory(\''${ContourThirdParties_SRCDIR}/termbench_pro EXCLUDE_FROM_ALL) + endmacro() + EOF + + ln -s ${libunicode-src} _deps/sources/libunicode + ln -s ${termbench-pro-src} _deps/sources/termbench_pro - buildInputs = [ freetype libGL pcre ]; + # Don't fix Darwin app bundle + sed -i '/fixup_bundle/d' src/contour/CMakeLists.txt + ''; passthru.tests.test = nixosTests.terminal-emulators.contour; meta = with lib; { description = "Modern C++ Terminal Emulator"; - homepage = "https://github.com/christianparpart/contour"; - changelog = "https://github.com/christianparpart/contour/blob/HEAD/Changelog.md"; + homepage = "https://github.com/contour-terminal/contour"; + changelog = "https://github.com/contour-terminal/contour/raw/v${version}/Changelog.md"; license = licenses.asl20; maintainers = with maintainers; [ fortuneteller2k ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/contour.x86_64-darwin }; } |