From 6d25c42a433063aaf688ef0bccac7556ce56043c Mon Sep 17 00:00:00 2001 From: Carlos Date: Sat, 8 Feb 2025 00:43:09 +0100 Subject: [PATCH] gphoto2: remove patch already applied upstream --- .../misc/gphoto2/add-type-casts.diff | 21 ------------------- pkgs/applications/misc/gphoto2/default.nix | 2 -- 2 files changed, 23 deletions(-) delete mode 100644 pkgs/applications/misc/gphoto2/add-type-casts.diff diff --git a/pkgs/applications/misc/gphoto2/add-type-casts.diff b/pkgs/applications/misc/gphoto2/add-type-casts.diff deleted file mode 100644 index fd0f6f88c331..000000000000 --- a/pkgs/applications/misc/gphoto2/add-type-casts.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/gphoto2/main.c b/gphoto2/main.c -index 2bf5964..cd84467 100644 ---- a/gphoto2/main.c -+++ b/gphoto2/main.c -@@ -1215,14 +1215,14 @@ start_timeout_func (Camera *camera, unsigned int timeout, - - pthread_create (&tid, NULL, thread_func, td); - -- return (tid); -+ return (unsigned int)tid; - } - - static void - stop_timeout_func (Camera __unused__ *camera, unsigned int id, - void __unused__ *data) - { -- pthread_t tid = id; -+ pthread_t tid = (pthread_t)id; - - pthread_cancel (tid); - pthread_join (tid, NULL); diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 42037008d0ef..3822b1655b1b 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-t5EnM4WaDbOTPM+rJW+hQxBgNErnnZEN9lZvxTKoDhA="; }; - patches = [ ./add-type-casts.diff ]; - nativeBuildInputs = [ autoreconfHook pkg-config