colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #175239 from marsam/update-contour

Browse Source 
contour: 0.1.1 -> 0.3.1.200
This commit is contained in:
Mario Rodas 2022-05-29 11:28:01 -05:00 committed by GitHub
commit ceaa65cb04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 86 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
pkgs/applications/terminal-emulators/contour/default.nix
View File

@ -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
}:
mkDerivation rec {
pname = "contour";
version = "0.1.1";
src = fetchFromGitHub {
owner = "christianparpart";
repo = pname;
rev = "v${version}";
sha256 = "sha256-P7t+M75ZWjFcGWngcbaurdit6e+pb0ILljimhYqW0NI=";
fetchSubmodules = true;
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=";
};
nativeBuildInputs = [ cmake pkg-config ];
termbench-pro-src = fetchFromGitHub {
owner = "contour-terminal";
repo = "termbench-pro";
rev = "cd571e3cebb7c00de9168126b28852f32fb204ed";
sha256 = "sha256-dNtOmBu63LFYfiGjXf34C2tiG8pMmsFT4yK3nBnK9WI=";
};
in
mkDerivation rec {
pname = "contour";
version = "0.3.1.200";
buildInputs = [ freetype libGL pcre ];
src = fetchFromGitHub {
owner = "contour-terminal";
repo = pname;
rev = "v${version}";
sha256 = "sha256-TpxVC0GFZD3jGISnDWHKEetgVVpznm5k/Vc2dwVfSG4=";
};
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
# 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
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -1516,7 +1516,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL;
};
contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { };
contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { fmt = fmt_8; };
cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };