Unverified Commit 796d699b authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #273178 from nagy/nagy-swayimg 

swayimg: 0.11 -> 0.12
parents 5ba07454 ba94c68e

pkgs/tools/wayland/swayimg/default.nix→pkgs/by-name/sw/swayimg/package.nix

+17 −15
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, meson

, ninja

, pkg-config
@@ -20,27 +19,21 @@ 
, libpng

, libjxl

, libexif

, openexr_3

, bash-completion

, testers

}:

stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "swayimg";

  version = "1.11";

  version = "1.12";



  src = fetchFromGitHub {

    owner = "artemsen";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-UwIufR3EwbpNVHD1GypV3qNgiqDRllwtxAM0CZPodn0=";

    repo = "swayimg";

    rev = "v${finalAttrs.version}";

    sha256 = "sha256-aKDt4lPh4w0AOucN7VrA7mo8SHI9eJqdrpJF+hG93gI=";

  };



  patches = [

    (fetchpatch {

      name = "link-libwebp-1.3.1.patch";

      url = "https://github.com/artemsen/swayimg/commit/bd3d6c838c699b876fd8c19b408c475eb47e17b6.patch";

      hash = "sha256-2aMq/GTqyKw+CQr8o8ij4P4yNjBXYKXShQUknStUb5c=";

    })

  ];



  strictDeps = true;



  depsBuildBuild = [
@@ -49,6 +42,10 @@ stdenv.mkDerivation rec { 


  nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];



  mesonFlags = [

    (lib.mesonOption "version" finalAttrs.version)

  ];



  buildInputs = [

    bash-completion

    wayland
@@ -65,8 +62,13 @@ stdenv.mkDerivation rec { 
    libpng

    libjxl

    libexif

    openexr_3

  ];



  passthru.tests.version = testers.testVersion {

    package = finalAttrs.finalPackage;

  };



  meta = with lib; {

    homepage = "https://github.com/artemsen/swayimg";

    description = "Image viewer for Sway/Wayland";
@@ -76,4 +78,4 @@ stdenv.mkDerivation rec { 
    platforms = platforms.linux;

    mainProgram = "swayimg";

  };

}
 
})

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -4823,8 +4823,6 @@ with pkgs; 














  swaysome = callPackage ../tools/wayland/swaysome { };



























  swayimg = callPackage ../tools/wayland/swayimg { };



























  swaytools = python3Packages.callPackage ../tools/wayland/swaytools { };





























  swww = callPackage ../tools/wayland/swww { };