diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-05-17 14:05:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-17 14:05:17 +0200 |
commit | c19fa9be5efbe1eb98bb299f44db563aa249aaae (patch) | |
tree | 74db563511e82758c185e64e0a80370271523ad9 | |
parent | 85d6f3bcd9cbcc52c4a307d2ef5116dab4b41641 (diff) | |
parent | 221e5eba47110ef9a174e2c5caf66351609c16ba (diff) | |
download | nixpkgs-c19fa9be5efbe1eb98bb299f44db563aa249aaae.tar nixpkgs-c19fa9be5efbe1eb98bb299f44db563aa249aaae.tar.gz nixpkgs-c19fa9be5efbe1eb98bb299f44db563aa249aaae.tar.bz2 nixpkgs-c19fa9be5efbe1eb98bb299f44db563aa249aaae.tar.lz nixpkgs-c19fa9be5efbe1eb98bb299f44db563aa249aaae.tar.xz nixpkgs-c19fa9be5efbe1eb98bb299f44db563aa249aaae.tar.zst nixpkgs-c19fa9be5efbe1eb98bb299f44db563aa249aaae.zip |
Merge pull request #87953 from ccellado/glpaper-unstable
-rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/glpaper/default.nix | 29 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 37 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fda8fd8d204..1877720d034 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1280,6 +1280,12 @@ githubId = 64804; name = "Dennis Gosnell"; }; + ccellado = { + email = "annplague@gmail.com"; + github = "ccellado"; + githubId = 44584960; + name = "Denis Khalmatov"; + }; ceedubs = { email = "ceedubs@gmail.com"; github = "ceedubs"; diff --git a/pkgs/development/tools/glpaper/default.nix b/pkgs/development/tools/glpaper/default.nix new file mode 100644 index 00000000000..94d140552a1 --- /dev/null +++ b/pkgs/development/tools/glpaper/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchhg, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols +, libX11, libGL }: + +stdenv.mkDerivation { + name = "glpaper"; + version = "unstable-2020-03-30"; + + src = fetchhg { + url = "https://hg.sr.ht/~scoopta/glpaper"; + rev = "a95db77088dfb5636a87f3743fc9b5eca70c1ae2"; + sha256 = "04y12910wvhy4aqx2sa63dy9l6nbs7b77yqpdhc96x2b3mgzgjfs"; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ + wayland + libX11 # required by libglvnd + libGL + ]; + + meta = with stdenv.lib; { + description = + "Wallpaper program for wlroots based Wayland compositors such as sway that allows you to render glsl shaders as your wallpaper"; + homepage = "https://hg.sr.ht/~scoopta/glpaper"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ccellado ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f38c94f1bcf..729f97d65a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1862,6 +1862,8 @@ in gixy = callPackage ../tools/admin/gixy { }; + glpaper = callPackage ../development/tools/glpaper { }; + gllvm = callPackage ../development/tools/gllvm { }; glide = callPackage ../development/tools/glide { }; |