summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Șerbănescu <daniel@serbanescu.dk>2021-04-28 15:23:47 +0200
committerJan Tojnar <jtojnar@gmail.com>2021-05-05 22:42:17 +0200
commitb209b81d7aeea27db4ee94a7588f4a153e74c949 (patch)
treeb00f04a2c32971178b5d6d9dbed0ed345ee73011
parent02a7be6aba5f2380687108032605f28a3cf03096 (diff)
downloadnixpkgs-b209b81d7aeea27db4ee94a7588f4a153e74c949.tar
nixpkgs-b209b81d7aeea27db4ee94a7588f4a153e74c949.tar.gz
nixpkgs-b209b81d7aeea27db4ee94a7588f4a153e74c949.tar.bz2
nixpkgs-b209b81d7aeea27db4ee94a7588f4a153e74c949.tar.lz
nixpkgs-b209b81d7aeea27db4ee94a7588f4a153e74c949.tar.xz
nixpkgs-b209b81d7aeea27db4ee94a7588f4a153e74c949.tar.zst
nixpkgs-b209b81d7aeea27db4ee94a7588f4a153e74c949.zip
file-roller: fixed fatal error occuring when extracting zip files
-rw-r--r--pkgs/desktops/gnome-3/apps/file-roller/default.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index c095a9a5d65..c6a2a3a6400 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome3, gettext, itstool, libxml2, libarchive
-, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }:
+, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales
+, unzip, cpio }:
 
 stdenv.mkDerivation rec {
   pname = "file-roller";
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson ninja gettext itstool pkg-config libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ];
 
-  buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus ];
+  buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus cpio ];
 
   PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
 
@@ -24,6 +25,12 @@ stdenv.mkDerivation rec {
     patchShebangs data/set-mime-type-entry.py
   '';
 
+  postFixup = ''
+    # Workaround because of https://gitlab.gnome.org/GNOME/file-roller/issues/40
+    wrapProgram "$out/bin/file-roller" \
+      --prefix PATH : ${lib.makeBinPath [ unzip ]}
+  '';
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "file-roller";