mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-12 03:56:17 +03:00
Merge pull request #199580 from wegank/tenacity-bump
This commit is contained in:
commit
11956c2e38
@ -1,8 +1,9 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromSourcehut
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, wxGTK31
|
||||
, wxGTK32
|
||||
, gtk3
|
||||
, pkg-config
|
||||
, python3
|
||||
@ -48,15 +49,23 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tenacity";
|
||||
version = "unstable-2021-10-18";
|
||||
version = "unstable-2022-06-30";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~tenacity";
|
||||
repo = "tenacity";
|
||||
rev = "697c0e764ccb19c1e2f3073ae08ecdac7aa710e4";
|
||||
sha256 = "1fc9xz8lyl8si08wkzncpxq92vizan60c3640qr4kbnxg7vi2iy4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tenacityteam";
|
||||
repo = pname;
|
||||
rev = "91f8b4340b159af551fff94a284c6b0f704a7932";
|
||||
sha256 = "sha256-4VWckXzqo2xspw9eUloDvjxQYbsHn6ghEDw+hYqJcCE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/wxwidgets-gtk3-3.1.6-plus.patch?h=tenacity-wxgtk3-git&id=c2503538fa7d7001181905988179952d09f69659";
|
||||
postFetch = "echo >> $out";
|
||||
sha256 = "sha256-xRY1tizBJ9CBY6e9oZVz4CWx7DWPGD9A9Ysol4prBww=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
touch src/RevisionIdent.h
|
||||
|
||||
@ -124,7 +133,7 @@ stdenv.mkDerivation rec {
|
||||
sratom
|
||||
suil
|
||||
twolame
|
||||
wxGTK31
|
||||
wxGTK32
|
||||
gtk3
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
at-spi2-core
|
||||
|
Loading…
Reference in New Issue
Block a user