Merge pull request #69403 from worldofpeace/peek/update

peek: 1.3.1 -> 1.4.0

pkgs/applications/video/peek/default.nix

@@ -1,45 +1,78 @@
-{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala_0_40, wrapGAppsHook
+{ stdenv
-, gsettings-desktop-schemas, gtk3, keybinder3, ffmpeg
+, fetchFromGitHub
+, meson
+, ninja
+, gettext
+, desktop-file-utils
+, appstream-glib
+, pkgconfig
+, txt2man
+, gzip
+, vala
+, wrapGAppsHook
+, gsettings-desktop-schemas
+, gtk3
+, glib
+, cairo
+, keybinder3
+, ffmpeg
+, python3
+, libxml2
+, gst_all_1
+, which
+, gifski
 }:
 
 stdenv.mkDerivation rec {
   pname = "peek";
-  version = "1.3.1";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "phw";
-    repo = pname;
+    repo = "peek";
     rev = version;
-    sha256 = "1fnvlklmg6s5rs3ql74isa5fgdkqqrpsyf8k2spxj520239l4vgb";
+    sha256 = "0q70hz9anqywqgksd43i8v9ijwy6djyzwnzzd94j44xqwsk9zdbb";
   };
 
-  preConfigure = ''
-    gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg ]})
-  '';
-
   nativeBuildInputs = [
-    cmake
+    appstream-glib
+    desktop-file-utils
     gettext
+    gzip
+    meson
+    ninja
+    libxml2
     pkgconfig
-    libxml2.bin
     txt2man
-    vala_0_40 # See https://github.com/NixOS/nixpkgs/issues/58433
+    python3
+    vala
     wrapGAppsHook
   ];
 
   buildInputs = [
+    cairo
+    glib
     gsettings-desktop-schemas
     gtk3
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-ugly
     keybinder3
   ];
 
-  enableParallelBuilding = true;
+  postPatch = ''
+    patchShebangs build-aux/meson/postinstall.py data/man/build_man.sh
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ which ffmpeg gifski ]})
+  '';
 
   meta = with stdenv.lib; {
-    homepage    = https://github.com/phw/peek;
+    homepage = https://github.com/phw/peek;
     description = "Simple animated GIF screen recorder with an easy to use interface";
-    license     = licenses.gpl3;
+    license = licenses.gpl3;
-    maintainers = with maintainers; [ puffnfresh ];
+    maintainers = with maintainers; [ puffnfresh worldofpeace ];
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
   };
 }

pkgs/tools/graphics/gifski/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gifski";
-  version = "0.8.7";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "ImageOptim";
     repo = "gifski";
     rev = version;
-    sha256 = "0x41gyc5jk45jlx0hcq80j5gj1f66lcmbclqyx70l43ggslsi26f";
+    sha256 = "0dl5725imb2a2s0fskdqlnh2207ryyi2v5gz37cr5mf6khz898p2";
   };
 
-  cargoSha256 = "1pik6jcxg3amb5widpxn8j9szghbrhl0wsxjisizas3033xzrhcf";
+  cargoSha256 = "0wngsd0pmmxlwzxmyp8pvphh1ijs5s9k1mkkv688xpc4b8w0z10j";
 
   nativeBuildInputs = [ pkgconfig ];