about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2024-01-20 18:57:55 +0100
committerGitHub <noreply@github.com>2024-01-20 18:57:55 +0100
commit2e7eed72914de2d0d4d38e4d545ca26702dba818 (patch)
treea7297a270c656866a92bfaca55fd7a739156326a
parent48ca30331ebb1aec14c9acc813b8b742779eb0ad (diff)
parent81e01976d383bf474ab43b8248753138fc442c40 (diff)
downloadnixlib-2e7eed72914de2d0d4d38e4d545ca26702dba818.tar
nixlib-2e7eed72914de2d0d4d38e4d545ca26702dba818.tar.gz
nixlib-2e7eed72914de2d0d4d38e4d545ca26702dba818.tar.bz2
nixlib-2e7eed72914de2d0d4d38e4d545ca26702dba818.tar.lz
nixlib-2e7eed72914de2d0d4d38e4d545ca26702dba818.tar.xz
nixlib-2e7eed72914de2d0d4d38e4d545ca26702dba818.tar.zst
nixlib-2e7eed72914de2d0d4d38e4d545ca26702dba818.zip
Merge pull request #280069 from wegank/flirc-bump
flirc: 3.24.3 -> 3.27.10
-rw-r--r--pkgs/applications/video/flirc/default.nix17
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/applications/video/flirc/default.nix b/pkgs/applications/video/flirc/default.nix
index 58de5ceab099..fc7302378300 100644
--- a/pkgs/applications/video/flirc/default.nix
+++ b/pkgs/applications/video/flirc/default.nix
@@ -1,23 +1,28 @@
 { lib
-, mkDerivation
+, stdenv
 , fetchurl
 , autoPatchelfHook
+, wrapQtAppsHook
 , hidapi
 , readline
 , qtsvg
 , qtxmlpatterns
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation {
   pname = "flirc";
-  version = "3.24.3";
+  version = "3.27.10";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20211021211803/http://apt.flirc.tv/arch/x86_64/flirc.latest.x86_64.tar.gz";
-    sha256 = "0p4pp7j70lbw6m25lmjg6ibc67r6jcy7qs3kki9f86ji1jvrxpga";
+    url = "https://web.archive.org/web/20240110170238/http://apt.flirc.tv/arch/x86_64/flirc.latest.x86_64.tar.gz";
+    hash = "sha256-iTr4vzFQ/+dsbsYD6sc8aTHctTkLKf5HnHBnO7cX5qc=";
   };
 
-  nativeBuildInputs = [ autoPatchelfHook ];
+  nativeBuildInputs = [
+    autoPatchelfHook
+    wrapQtAppsHook
+  ];
+
   buildInputs = [
     hidapi
     readline
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00cc4894e249..99ef9b34d3f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3831,7 +3831,7 @@ with pkgs;
   flavours = callPackage ../applications/misc/flavours { };
 
   flirc = libsForQt5.callPackage ../applications/video/flirc {
-    readline = readline63;
+    readline = readline70;
   };
 
   flood = callPackage ../applications/networking/p2p/flood { };