From a0f7ee0e60c27b2759ff64c43836f9ec09aac914 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 16 May 2018 01:25:59 +0800 Subject: [PATCH] kdenlive: Fix build by removing already upstreamed patch --- .../kde/kdenlive-cmake-concurrent-module.patch | 12 ------------ pkgs/applications/kde/kdenlive.nix | 3 --- 2 files changed, 15 deletions(-) delete mode 100644 pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch diff --git a/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch b/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch deleted file mode 100644 index ea2af2b09509f6..00000000000000 --- a/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur kdenlive-17.04.1-upstream/CMakeLists.txt kdenlive-17.04.1/CMakeLists.txt ---- kdenlive-17.04.1-upstream/CMakeLists.txt 2017-06-10 00:06:44.773146595 -0400 -+++ kdenlive-17.04.1/CMakeLists.txt 2017-06-10 00:07:35.766596566 -0400 -@@ -79,7 +79,7 @@ - check_include_files(malloc.h HAVE_MALLOC_H) - check_include_files(pthread.h HAVE_PTHREAD_H) - --find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick ) -+find_package(Qt5 REQUIRED COMPONENTS Core Concurrent DBus Widgets Script Svg Quick ) - find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET) - - find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET) diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index b5eca47d6c0eb5..65080ba7f066b2 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -34,9 +34,6 @@ mkDerivation { name = "kdenlive"; - patches = [ - ./kdenlive-cmake-concurrent-module.patch - ]; nativeBuildInputs = [ extra-cmake-modules kdoctools