diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-07-18 08:29:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-07-18 08:29:53 +0200 |
| commit | 250922fd1e061f2132d33b778424f4e9ed42354a (patch) | |
| tree | c26970f54a01d8d612c82818de8d2104172b9fa0 /pkgs/desktops/pantheon/apps/elementary-files/default.nix | |
| parent | 0ff0b14968e7474fbb917fbb096a8d89d121922f (diff) | |
| parent | 950a258b9ef24ca4346bbf722a694c2ab54e4654 (diff) | |
| download | nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar.gz nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar.bz2 nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar.lz nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar.xz nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar.zst nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/desktops/pantheon/apps/elementary-files/default.nix')
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-files/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 6944dfac1ea..9817962920a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -32,6 +33,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ + # Fix terminal critical warnings and possible crash when removing bookmark + # https://github.com/elementary/files/pull/2062 + (fetchpatch { + url = "https://github.com/elementary/files/commit/daa5ab244b45aafdd7be49eb0bd6f052ded5b5a7.patch"; + sha256 = "sha256-crGvbo9Ye9656cOy6YqNreMLE2pEMO0Rg8oz81OfJkw="; + }) + ]; + src = fetchFromGitHub { owner = "elementary"; repo = "files"; |