From e91a333a97201a02806d86666012fe31115cfdb7 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Mon, 29 Apr 2019 18:50:52 +0100 Subject: Swaybg: init --- default.nix | 2 +- pkgs/swaybg/default.nix | 35 +++++++++++++++++++++++++++++++++++ pkgs/swaybg/metadata.nix | 5 +++++ update.sh | 2 +- 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 pkgs/swaybg/default.nix create mode 100644 pkgs/swaybg/metadata.nix diff --git a/default.nix b/default.nix index e498560..9cc42e6 100644 --- a/default.nix +++ b/default.nix @@ -9,6 +9,7 @@ waylandPkgs = rec { wlroots = pkgs.callPackage ./pkgs/wlroots {}; xdg-desktop-portal-wlr = pkgs.callPackage ./pkgs/xdg-desktop-portal-wlr {}; sway = pkgs.callPackage ./pkgs/sway {}; + swaybg = pkgs.callPackage ./pkgs/swaybg {}; swayidle = pkgs.callPackage ./pkgs/swayidle {}; swaylock = pkgs.callPackage ./pkgs/swaylock {}; grim = pkgs.callPackage ./pkgs/grim {}; @@ -36,4 +37,3 @@ waylandPkgs = rec { }; in waylandPkgs // { inherit waylandPkgs; } - diff --git a/pkgs/swaybg/default.nix b/pkgs/swaybg/default.nix new file mode 100644 index 0000000..dad17f9 --- /dev/null +++ b/pkgs/swaybg/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub +, meson, ninja, pkgconfig +, cairo, wayland, wayland-protocols +, gdk_pixbuf, nonPngSupport ? true +, scdoc, buildDocs ? true +}: + +let + metadata = import ./metadata.nix; +in +stdenv.mkDerivation rec { + pname = "swaybg"; + version = metadata.rev; + + src = fetchFromGitHub { + owner = "swaywm"; + repo = "swaybg"; + rev = version; + sha256 = metadata.sha256; + }; + + nativeBuildInputs = [ pkgconfig meson ninja ] ++ stdenv.lib.optional buildDocs [ scdoc ]; + + buildInputs = [ cairo wayland wayland-protocols ] ++ stdenv.lib.optional nonPngSupport [ gdk_pixbuf ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Wallpaper tool for Wayland compositors"; + homepage = https://github.com/swaywm/swaybg; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/swaybg/metadata.nix b/pkgs/swaybg/metadata.nix new file mode 100644 index 0000000..8acf5f8 --- /dev/null +++ b/pkgs/swaybg/metadata.nix @@ -0,0 +1,5 @@ +{ + rev = "cf62ace04b82eaf7ad05c55639d1fd04e8380f2a"; + sha256 = "1lmqz5bmig90gq2m7lwf02d2g7z4hzf8fhqz78c8vk92c6p4xwbc"; + revdate = "2019-04-29T18:31:55Z"; +} diff --git a/update.sh b/update.sh index f2587bf..dcbdcaa 100755 --- a/update.sh +++ b/update.sh @@ -40,6 +40,7 @@ update "nixpkgs/nixpkgs-unstable" "nixos" "nixpkgs-channels" "nixpkgs-unstable" update "pkgs/wlroots" "swaywm" "wlroots" "master" update "pkgs/xdg-desktop-portal-wlr" "emersion" "xdg-desktop-portal-wlr" "master" update "pkgs/sway" "swaywm" "sway" "master" +update "pkgs/swaybg" "swaywm" "swaybg" "master" update "pkgs/swayidle" "swaywm" "swayidle" "master" update "pkgs/swaylock" "swaywm" "swaylock" "master" update "pkgs/slurp" "emersion" "slurp" "master" @@ -79,4 +80,3 @@ rg --multiline '(?s)(.*)(.*)(.*)' "README.md" \ # build and push nix-build --no-out-link build.nix -A all | cachix push "${cachixremote}" - -- cgit v1.2.3 From 9de4c54ef799b0390eccabda4847a4fdd0e2b03a Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Mon, 29 Apr 2019 22:29:38 +0100 Subject: swaybg: Fix optional dependencies --- pkgs/swaybg/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/swaybg/default.nix b/pkgs/swaybg/default.nix index dad17f9..ff4e1e2 100644 --- a/pkgs/swaybg/default.nix +++ b/pkgs/swaybg/default.nix @@ -19,9 +19,12 @@ stdenv.mkDerivation rec { sha256 = metadata.sha256; }; - nativeBuildInputs = [ pkgconfig meson ninja ] ++ stdenv.lib.optional buildDocs [ scdoc ]; + nativeBuildInputs = [ pkgconfig meson ninja ] ++ stdenv.lib.optional buildDocs scdoc; - buildInputs = [ cairo wayland wayland-protocols ] ++ stdenv.lib.optional nonPngSupport [ gdk_pixbuf ]; + buildInputs = [ cairo wayland wayland-protocols ] ++ stdenv.lib.optional nonPngSupport gdk_pixbuf; + + mesonFlags = stdenv.lib.optional nonPngSupport [ "-Dgdk-pixbuf=enabled" ] + ++ stdenv.lib.optional buildDocs [ "-Dman-pages=enabled" ]; enableParallelBuilding = true; -- cgit v1.2.3 From e462e897cefa65e8569bf92fd822a4945d9da2d6 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Mon, 29 Apr 2019 22:47:24 +0100 Subject: swaybg: remove unnecessary lists --- pkgs/swaybg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/swaybg/default.nix b/pkgs/swaybg/default.nix index ff4e1e2..7f4347a 100644 --- a/pkgs/swaybg/default.nix +++ b/pkgs/swaybg/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ cairo wayland wayland-protocols ] ++ stdenv.lib.optional nonPngSupport gdk_pixbuf; - mesonFlags = stdenv.lib.optional nonPngSupport [ "-Dgdk-pixbuf=enabled" ] - ++ stdenv.lib.optional buildDocs [ "-Dman-pages=enabled" ]; + mesonFlags = stdenv.lib.optional nonPngSupport "-Dgdk-pixbuf=enabled" + ++ stdenv.lib.optional buildDocs "-Dman-pages=enabled"; enableParallelBuilding = true; -- cgit v1.2.3