b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #146840 from mkg20001/twup

Browse source
This commit is contained in:
Maciej Krüger 2021-12-04 12:52:32 +01:00 committed by GitHub
parent ccb03c908b 195f135357
commit c52ea537b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/applications/networking/instant-messengers/twinkle/default.nix
View file

@ -15,20 +15,19 @@
, alsa-lib
, speex
, ilbc
, fetchurl
, mkDerivation
, bcg729
}:
mkDerivation rec {
pname = "twinkle";
version = "1.10.2";
version = "unstable-2021-02-06";
src = fetchFromGitHub {
repo = pname;
owner = "LubosD";
rev = "v${version}";
sha256 = "0s0gi03xwvzp02ah4q6j33r9jx9nbayr6dxlg2ck9pwbay1nq1hx";
repo = "twinkle";
rev = "2301b66a3f54b266675415d261985488d86e9e4c";
sha256 = "xSwcaj1Hm62iL7C/AxqjVR07VEae8gDgYdr2EWmCoOM=";
};
buildInputs = [
@ -46,19 +45,6 @@ mkDerivation rec {
ilbc
];
patches = [
# patch for bcg729 1.0.2+
(fetchurl { # https://github.com/LubosD/twinkle/pull/152
url = "https://github.com/LubosD/twinkle/compare/05082ae12051821b1d969e6672d9e4e5afe1bc07...7a6c533cda387652b5b4cb2a867be1a18585890c.patch";
sha256 = "39fc6cef3e88cfca8db44612b2d082fb618027b0f99509138d3c0d2777a494c2";
})
# patch manual link to not link to old url, which now points to NSFW page
(fetchurl { # https://github.com/LubosD/twinkle/commit/05082ae12051821b1d969e6672d9e4e5afe1bc07
url = "https://github.com/LubosD/twinkle/commit/05082ae12051821b1d969e6672d9e4e5afe1bc07.diff";
sha256 = "1iamragr9wp2vczsnp6n261fpr1ai2nc2abp0228jlar9zafksw0";
})
];
nativeBuildInputs = [
cmake
bison