diff options
| author | Robin Gloster <mail@glob.in> | 2016-05-02 22:58:02 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-05-02 22:58:02 +0000 |
| commit | c92bca56f8ea5623cf01952621455db308d0f330 (patch) | |
| tree | f940e6e4fabd8e58b91fe885f9541205258023b2 /pkgs/desktops/gnome-3 | |
| parent | 0fdde5efd08c036fe9d73b4e65f2ba9797053d0f (diff) | |
| parent | 94520a25adc6b6bee799ec9dab344cfdad3f7180 (diff) | |
| download | nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.gz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.bz2 nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.lz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.xz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.zst nixlib-c92bca56f8ea5623cf01952621455db308d0f330.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix index df90c7b29773..d5b2558cf707 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix @@ -1,18 +1,17 @@ { stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive -, attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf }: +, attr, bzip2, acl, wrapGAppsHook, librsvg, libnotify, gdk_pixbuf }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - # TODO: support nautilus - # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive + buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive libnotify gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg gnome3.dconf ]; + installFlags = [ "nautilus_extensiondir=$(out)/lib/nautilus/extensions-3.0" ]; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/FileRoller; description = "Archive manager for the GNOME desktop environment"; |