summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-11-01 17:53:43 +0100
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2020-11-01 23:38:03 +0100
commit016bfce7d266ac9c8e44c776c86e8394474281a8 (patch)
tree486522b2dafb7b19fdcf9b6abdf8da891d053c29
parent7698197323bca022727730b1e25c141237db6901 (diff)
downloadnixpkgs-016bfce7d266ac9c8e44c776c86e8394474281a8.tar
nixpkgs-016bfce7d266ac9c8e44c776c86e8394474281a8.tar.gz
nixpkgs-016bfce7d266ac9c8e44c776c86e8394474281a8.tar.bz2
nixpkgs-016bfce7d266ac9c8e44c776c86e8394474281a8.tar.lz
nixpkgs-016bfce7d266ac9c8e44c776c86e8394474281a8.tar.xz
nixpkgs-016bfce7d266ac9c8e44c776c86e8394474281a8.tar.zst
nixpkgs-016bfce7d266ac9c8e44c776c86e8394474281a8.zip
kdenlive: avoid double wrapping
-rw-r--r--pkgs/applications/kde/kdenlive.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index 795ba87ad5b..8be6ef88e64 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -84,12 +84,20 @@ mkDerivation {
       sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|'
       substituteAllInPlace src/kdenlivesettings.kcfg
     '';
+
+  dontWrapGApps = true;
+
   # Frei0r path needs to be set too or Kdenlive will complain. See:
   # https://github.com/NixOS/nixpkgs/issues/83885
   # https://github.com/NixOS/nixpkgs/issues/29614#issuecomment-488849325
   qtWrapperArgs = [
     "--set FREI0R_PATH ${frei0r}/lib/frei0r-1"
   ];
+
+  preFixup = ''
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   meta = {
     license = with lib.licenses; [ gpl2Plus ];
   };