about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-03-22 19:47:02 +0100
committerJan Tojnar <jtojnar@gmail.com>2018-03-23 13:18:36 +0100
commitcb23f4dbeef25b5205511772984a3e74fffe053e (patch)
tree4170383808b3adeaab4684fbb1960f9498527e5b /pkgs/desktops
parentb4b00016a26dabe0a6f6a9a8012288eff4a61d49 (diff)
downloadnixlib-cb23f4dbeef25b5205511772984a3e74fffe053e.tar
nixlib-cb23f4dbeef25b5205511772984a3e74fffe053e.tar.gz
nixlib-cb23f4dbeef25b5205511772984a3e74fffe053e.tar.bz2
nixlib-cb23f4dbeef25b5205511772984a3e74fffe053e.tar.lz
nixlib-cb23f4dbeef25b5205511772984a3e74fffe053e.tar.xz
nixlib-cb23f4dbeef25b5205511772984a3e74fffe053e.tar.zst
nixlib-cb23f4dbeef25b5205511772984a3e74fffe053e.zip
gnome3.gedit: clean up
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome-3/apps/gedit/default.nix33
1 files changed, 16 insertions, 17 deletions
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 864535794f87..7c90b16d86a1 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, intltool, fetchurl, enchant, isocodes
+{ stdenv, intltool, fetchurl
 , pkgconfig, gtk3, glib
-, bash, wrapGAppsHook, itstool, libsoup, libxml2
-, gnome3, librsvg, gdk_pixbuf, file, gspell }:
+, wrapGAppsHook, itstool, libsoup, libxml2
+, gnome3, gspell }:
 
 stdenv.mkDerivation rec {
   name = "gedit-${version}";
@@ -12,24 +12,23 @@ stdenv.mkDerivation rec {
     sha256 = "0pyam0zi44xq776x20ycqnvmf86l98jns8ldv4m81gnp9wnhmycv";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gedit"; attrPath = "gnome3.gedit"; };
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ];
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
-  buildInputs = [ gtk3 glib intltool itstool enchant isocodes
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup
-                  gnome3.libpeas gnome3.gtksourceview libxml2
-                  gnome3.gsettings-desktop-schemas gnome3.dconf file gspell ];
+  buildInputs = [
+    gtk3 glib
+    gnome3.defaultIconTheme libsoup
+    gnome3.libpeas gnome3.gtksourceview
+    gnome3.gsettings-desktop-schemas gspell
+  ];
 
   enableParallelBuilding = true;
 
-  preFixup = ''
-    gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gnome3.libpeas gnome3.gtksourceview ]}")
-  '';
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gedit";
+      attrPath = "gnome3.gedit";
+    };
+  };
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Gedit;