Unverified Commit 81ff0b61 authored by Stefan Frijters's avatar Stefan Frijters
Browse files

conky: 1.22.1 -> 1.22.2

parent 57a9488f

pkgs/os-specific/linux/conky/default.nix

+2 −11
Original line number Diff line number Diff line
@@ -89,24 +89,15 @@ assert extrasSupport -> python3 != null; 


stdenv.mkDerivation (finalAttrs: {

  pname = "conky";

  version = "1.22.1";

  version = "1.22.2";



  src = fetchFromGitHub {

    owner = "brndnmtthws";

    repo = "conky";

    tag = "v${finalAttrs.version}";

    hash = "sha256-tEJQWZBaiX/bONPZEuGcvbGidktcvxUZtLvcGjz71Lk=";

    hash = "sha256-tMnfdW1sbZkt8v6DITM2R0ZwyN+xs7VLGZDityYt38Q=";

  };



  patches = [

    # Upstream patch to install extra syntax files, remove after next release

    (fetchpatch {

      name = "install-extra-syntax-files";

      url = "https://github.com/brndnmtthws/conky/commit/c67d8c27d1d091968a98ee49b313935eb7ea67fd.patch";

      hash = "sha256-NaQlQm+7iJWtdKYErTak5CPLNUBlsWb7sECNg0i3fWY=";

    })

  ];



  # pkg-config doesn't detect wayland-scanner in cross-compilation for some reason

  postPatch = ''

    substituteInPlace cmake/ConkyPlatformChecks.cmake \