diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-07-03 09:49:55 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-07-03 09:54:26 +0800 |
| commit | f93ef1c7750b8473d6d7946f1e339652dc44fc22 (patch) | |
| tree | da45ab9362aad739f4df8039f24d8190bcbe61ed | |
| parent | pantheon.elementary-files: 6.1.3 -> 6.1.4 (diff) | |
| download | nixpkgs-f93ef1c7750b8473d6d7946f1e339652dc44fc22.tar.gz | |
pantheon.elementary-camera: backport two fixes from 6.2.0
On master, elementary-camera has been updated to 6.1.0 in 63c45ddaf8 and 6.2.0 in a173b861ff.
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-camera/default.nix | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 31dfa369818f..8ad926fc0b2d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -40,6 +40,18 @@ stdenv.mkDerivation rec { url = "https://github.com/elementary/camera/commit/ead143b7e3246c5fa9bb37c95d491fb07cea9e04.patch"; sha256 = "sha256-2zGigUi6DpjJx8SEvAE3Q3jrm7MggOvLc72lAPMPvs4="; }) + # Fix jpeg pipeline + # https://github.com/elementary/camera/pull/212 + (fetchpatch { + url = "https://github.com/elementary/camera/commit/bb4c9e1eaef51469e562e6befce289b5822f281c.patch"; + sha256 = "sha256-UMciKs7k7QKHFaH7zazGRtkhP6+f38U2ZR3lE5fF22A="; + }) + # Add image/jpeg caps to device filter to support MJPEG webcams + # https://github.com/elementary/camera/pull/237 + (fetchpatch { + url = "https://github.com/elementary/camera/commit/2159d4142fb044f5724f883e8669726080da60ec.patch"; + sha256 = "sha256-snXtYRes9O27S51G4q13F4cV+zfRdki8FXwoR9DLJP4="; + }) ]; nativeBuildInputs = [ |