summary refs log tree commit diff
path: root/pkgs/desktops/gnome/core/nautilus
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2022-01-02 17:24:23 +0100
committerJan Tojnar <jtojnar@gmail.com>2022-01-02 17:27:49 +0100
commitbb54aca6887399e0819673fde81aa9189a18e4b5 (patch)
treedef791d764fdcb735c49cfed6d80a69195f35a19 /pkgs/desktops/gnome/core/nautilus
parent8b72976055c4d51647057917e7f71ddb02140f7b (diff)
downloadnixpkgs-bb54aca6887399e0819673fde81aa9189a18e4b5.tar
nixpkgs-bb54aca6887399e0819673fde81aa9189a18e4b5.tar.gz
nixpkgs-bb54aca6887399e0819673fde81aa9189a18e4b5.tar.bz2
nixpkgs-bb54aca6887399e0819673fde81aa9189a18e4b5.tar.lz
nixpkgs-bb54aca6887399e0819673fde81aa9189a18e4b5.tar.xz
nixpkgs-bb54aca6887399e0819673fde81aa9189a18e4b5.tar.zst
nixpkgs-bb54aca6887399e0819673fde81aa9189a18e4b5.zip
gnome.nautilus: fix build
Diffstat (limited to 'pkgs/desktops/gnome/core/nautilus')
-rw-r--r--pkgs/desktops/gnome/core/nautilus/default.nix16
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix
index 4f7df313ad5..3e45e616f4c 100644
--- a/pkgs/desktops/gnome/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome/core/nautilus/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv
 , fetchurl
+, fetchpatch
 , meson
 , ninja
 , pkg-config
@@ -10,7 +11,7 @@
 , wrapGAppsHook
 , gtk3
 , libhandy
-, libportal
+, libportal-gtk3
 , gnome
 , gnome-autoar
 , glib-networking
@@ -52,6 +53,17 @@ stdenv.mkDerivation rec {
       src = ./fix-paths.patch;
       inherit tracker;
     })
+
+    # Fix build with latest libportal
+    # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/749
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/nautilus/-/commit/55cfd66ccca391fc144f5863ff6bfc1f3b137e2d.patch";
+      sha256 = "xSb9l7xxEYpAwmdmeWT/t7Z9Ck3DPtsODzbReQW/Q70=";
+      excludes = [
+        "build-aux/flatpak/org.gnome.Nautilus.json"
+        "build-aux/flatpak/org.gnome.Nautilus.yml"
+      ];
+    })
   ];
 
   nativeBuildInputs = [
@@ -76,7 +88,7 @@ stdenv.mkDerivation rec {
     gst_all_1.gst-plugins-base
     gtk3
     libhandy
-    libportal
+    libportal-gtk3
     libexif
     libnotify
     libseccomp