Merge pull request #133163 from polykernel/wbg-patch-1

wbg: unstable-2020-08-01 -> 1.0.2

authored by

Sandro and committed by
GitHub
f7c81dc1 8821ccef

+36 -22
+36 -22
pkgs/applications/misc/wbg/default.nix
··· 1 1 { stdenv 2 2 , lib 3 - , fetchgit 3 + , fetchFromGitea 4 + , pkg-config 4 5 , meson 5 6 , ninja 6 - , pkg-config 7 - , git 8 - , scdoc 9 - , cairo 10 - , fcft 11 - , libpng 12 - , librsvg 13 - , libxkbcommon 14 7 , pixman 15 8 , tllist 16 9 , wayland 10 + , wayland-scanner 17 11 , wayland-protocols 18 - , wlroots 12 + , enablePNG ? true 13 + , enableJPEG ? true 14 + # Optional dependencies 15 + , libpng 16 + , libjpeg 19 17 }: 20 18 19 + let 20 + # Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54 21 + mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; 22 + in 23 + 21 24 stdenv.mkDerivation rec { 22 25 pname = "wbg"; 23 - version = "unstable-2020-08-01"; 26 + version = "1.0.2"; 24 27 25 - src = fetchgit { 26 - url = "https://codeberg.org/dnkl/wbg"; 27 - rev = "1b05bd80d0f40e3ba1e977002d0653f532649269"; 28 - sha256 = "0i1j7aqvj0vl2ww5cvffqci1kjqjn0sw6sp2j0ljblaif6qk9asc"; 28 + src = fetchFromGitea { 29 + domain = "codeberg.org"; 30 + owner = "dnkl"; 31 + repo = "wbg"; 32 + rev = version; 33 + sha256 = "sha256-PKEOWRcSAB4Uv5TfameQIEZh6s6xCGdyoZ13etL1TKA="; 29 34 }; 30 35 31 - nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; 36 + nativeBuildInputs = [ 37 + pkg-config 38 + meson 39 + ninja 40 + wayland-scanner 41 + ]; 42 + 32 43 buildInputs = [ 33 - cairo 34 - fcft 35 - libpng 36 - librsvg 37 - libxkbcommon 38 44 pixman 39 45 tllist 40 46 wayland 41 47 wayland-protocols 42 - wlroots 48 + ] ++ lib.optional enablePNG libpng 49 + ++ lib.optional enableJPEG libjpeg; 50 + 51 + mesonBuildType = "release"; 52 + 53 + mesonFlags = [ 54 + (mesonFeatureFlag "png" enablePNG) 55 + (mesonFeatureFlag "jpeg" enableJPEG) 43 56 ]; 44 57 45 58 meta = with lib; { 46 59 description = "Wallpaper application for Wayland compositors"; 47 60 homepage = "https://codeberg.org/dnkl/wbg"; 61 + changelog = "https://codeberg.org/dnkl/wbg/releases/tag/${version}"; 48 62 license = licenses.isc; 49 63 maintainers = with maintainers; [ AndersonTorres ]; 50 64 platforms = with platforms; linux;