From 4143d9dfefc208944faa1edc8dd3c17a874b5da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 3 Aug 2014 11:46:08 +0200 Subject: [PATCH] shotcut: remove obsolete patch --- pkgs/applications/video/shotcut/CuteLogger.patch | 13 ------------- pkgs/applications/video/shotcut/default.nix | 3 --- 2 files changed, 16 deletions(-) delete mode 100644 pkgs/applications/video/shotcut/CuteLogger.patch diff --git a/pkgs/applications/video/shotcut/CuteLogger.patch b/pkgs/applications/video/shotcut/CuteLogger.patch deleted file mode 100644 index 77b451cb437..00000000000 --- a/pkgs/applications/video/shotcut/CuteLogger.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git shotcut-14.07/CuteLogger/CuteLogger.pro shotcut-14.07/CuteLogger/CuteLogger.pro -index 501eddc..a5290b0 100644 ---- shotcut-14.07/CuteLogger/CuteLogger.pro -+++ shotcut-14.07/CuteLogger/CuteLogger.pro -@@ -42,7 +42,7 @@ unix:!symbian { - maemo5 { - target.path = /opt/usr/lib - } else { -- target.path = /usr/lib -+ target.path = $(INSTALL_ROOT)/usr/lib - } - INSTALLS += target - } diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 3f324480c8a..51baa32f61e 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -11,9 +11,6 @@ stdenv.mkDerivation rec { buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qt5 ]; - # Fixed in git and can be removed for the next release - patches = [ ./CuteLogger.patch ]; - configurePhase = "qmake PREFIX=$out"; postInstall = ''