Merge pull request #95495 from sternenseemann/fuzzel-1.4.0

fuzzel: 1.3.0 → 1.4.1; fcft: 0.4.3 → 2.2.6
This commit is contained in:
Daniël de Kok 2020-08-16 16:12:39 +02:00 committed by GitHub
commit 15affbfbd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fuzzel"; pname = "fuzzel";
version = "1.3.0"; version = "1.4.1";
src = fetchgit { src = fetchgit {
url = "https://codeberg.org/dnkl/fuzzel"; url = "https://codeberg.org/dnkl/fuzzel";
rev = "${version}"; rev = "${version}";
sha256 = "12jv5iwmksygw8nfkxbd9rbi03wnpgb30hczq009aqgy7lyi5zmp"; sha256 = "18pg46xry7q4i19mpjfz942c6vkqlrj4q18p85zldzv9gdsxnm9c";
}; };
nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; nativeBuildInputs = [ pkg-config meson ninja scdoc git ];

View File

@ -1,16 +1,17 @@
{ stdenv, lib, fetchgit, pkg-config, meson, ninja, freetype, fontconfig, pixman, tllist }: { stdenv, lib, fetchgit, pkg-config, meson, ninja, scdoc
,freetype, fontconfig, pixman, tllist }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fcft"; pname = "fcft";
version = "0.4.3"; version = "2.2.6";
src = fetchgit { src = fetchgit {
url = "https://codeberg.org/dnkl/fcft.git"; url = "https://codeberg.org/dnkl/fcft.git";
rev = "${version}"; rev = "${version}";
sha256 = "1r2k5726k6ps8ml2s1vqmpiggqxzq9pbzs7m0dsxk29mh8vg0psj"; sha256 = "06zywvvgrch9k4d07bir2sxddwsli2gzpvlvjfcwbrj3bw5x6j1b";
}; };
nativeBuildInputs = [ pkg-config meson ninja ]; nativeBuildInputs = [ pkg-config meson ninja scdoc ];
buildInputs = [ freetype fontconfig pixman tllist ]; buildInputs = [ freetype fontconfig pixman tllist ];
meta = with lib; { meta = with lib; {