summary refs log tree commit diff
path: root/pkgs/applications/kde/gwenview.nix
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-05-16 10:56:41 -0500
committerThomas Tuegel <ttuegel@mailbox.org>2017-06-18 08:43:39 -0500
commitbe7b7d908f82e8ab16c43ffd0e240addd6f4018a (patch)
tree81d875bcec94de6d94ce20725393d9c35f1c165a /pkgs/applications/kde/gwenview.nix
parent945758f96030ee7762ccdab32a3ffddd028b37b6 (diff)
downloadnixpkgs-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar
nixpkgs-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.gz
nixpkgs-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.bz2
nixpkgs-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.lz
nixpkgs-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.xz
nixpkgs-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.zst
nixpkgs-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.zip
Remove kdeWrapper
Diffstat (limited to 'pkgs/applications/kde/gwenview.nix')
-rw-r--r--pkgs/applications/kde/gwenview.nix35
1 files changed, 14 insertions, 21 deletions
diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index 19b2fd751f7..d206e901f8e 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -1,27 +1,20 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
   libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "gwenview";
-      meta = {
-        license = with lib.licenses; [ gpl2 fdl12 ];
-        maintainers = [ lib.maintainers.ttuegel ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw
-        libkipi phonon qtimageformats qtsvg qtx11extras
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/gwenview" ];
-  paths = [ kipi-plugins ];
+mkDerivation {
+  name = "gwenview";
+  meta = {
+    license = with lib.licenses; [ gpl2 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw
+    libkipi phonon qtimageformats qtsvg qtx11extras
+  ];
+  propagatedUserEnvPkgs = [ kipi-plugins ];
 }