diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
| commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
| tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/development/libraries/fcft | |
| parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
| parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
| download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip | |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/fcft')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/fcft/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/fcft/default.nix b/nixpkgs/pkgs/development/libraries/fcft/default.nix index e9cd3571c769..c431e6e2b3cf 100644 --- a/nixpkgs/pkgs/development/libraries/fcft/default.nix +++ b/nixpkgs/pkgs/development/libraries/fcft/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, pkg-config, meson, ninja, scdoc +{ stdenv, lib, fetchzip, pkg-config, meson, ninja, scdoc , freetype, fontconfig, pixman, tllist, check , withHarfBuzz ? true , harfbuzz @@ -6,12 +6,11 @@ stdenv.mkDerivation rec { pname = "fcft"; - version = "2.3.3"; + version = "2.4.0"; - src = fetchgit { - url = "https://codeberg.org/dnkl/fcft.git"; - rev = version; - sha256 = "0314r038jl17hrhc9nrbx30jk0pz8ckbdnizws4r46b1rf4h0b1f"; + src = fetchzip { + url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz"; + sha256 = "0z1r0s5s3dr1g4f3ylxfcmy3xb0ax02rw9mg7z8hzh0gxazrpndx"; }; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; |