Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 85d6f3bcd9cb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c19fa9be5efb
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on May 16, 2020

  1. maintainers: add ccellado

    @taikatytto
    taikatytto committed May 16, 2020
    Copy the full SHA
    1241af5 View commit details

  2. glpaper: init at unstable-2020-03-30

    @taikatytto
    taikatytto committed May 16, 2020
    Copy the full SHA
    221e5eb View commit details

Commits on May 17, 2020

  1. Merge pull request #87953 from ccellado/glpaper-unstable

    @jtojnar
    jtojnar authored May 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c19fa9b View commit details
Showing with 37 additions and 0 deletions.
  1. +6 −0 maintainers/maintainer-list.nix
  2. +29 −0 pkgs/development/tools/glpaper/default.nix
  3. +2 −0 pkgs/top-level/all-packages.nix
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
29 changes: 29 additions & 0 deletions pkgs/development/tools/glpaper/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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 { };