diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix index 4a50625cc81e..a01975a73ef3 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix @@ -4,12 +4,14 @@ , fetchurl , cmake , pkg-config +, boxed-cpp , freetype , fontconfig , libunicode , libutempter , termbench-pro , qtmultimedia +, qt5compat , wrapQtAppsHook , pcre , boost @@ -28,19 +30,18 @@ stdenv.mkDerivation (final: { pname = "contour"; - version = "0.3.12.262"; + version = "0.4.0.6245"; src = fetchFromGitHub { owner = "contour-terminal"; repo = "contour"; rev = "v${final.version}"; - hash = "sha256-4R0NyUtsyr3plYfVPom+EjJ5W0Cb/uuaSB5zyJ0yIB4="; + hash = "sha256-0A3fGbQPfzV4V4f5GGyjbQLJK+tX7ZVerAL7TkHhjdo="; }; - outputs = [ "out" "terminfo" ]; + patches = [ ./dont-fix-app-bundle.diff ]; - # fix missing <QtMultimedia/QAudioSink> on Darwin and codesign the binary - patches = [ ./contour-cmakelists.diff ./macos-codesign.diff ]; + outputs = [ "out" "terminfo" ]; nativeBuildInputs = [ cmake @@ -52,11 +53,13 @@ stdenv.mkDerivation (final: { ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; buildInputs = [ + boxed-cpp fontconfig freetype libunicode termbench-pro qtmultimedia + qt5compat pcre boost catch2 @@ -70,11 +73,6 @@ stdenv.mkDerivation (final: { cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ]; - preConfigure = '' - # Don't fix Darwin app bundle - sed -i '/fixup_bundle/d' src/contour/CMakeLists.txt - ''; - postInstall = '' mkdir -p $out/nix-support $terminfo/share '' + lib.optionalString stdenv.isDarwin '' |