Merge pull request #112326 from alyssais/wayfire

This commit is contained in:
Sandro 2021-02-08 17:47:49 +01:00 committed by GitHub
commit 60af240fc0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 15 deletions

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wayfire"; pname = "wayfire";
version = "0.6.0"; version = "0.7.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/WayfireWM/wayfire/releases/download/${version}/wayfire-${version}.tar.xz"; url = "https://github.com/WayfireWM/wayfire/releases/download/v${version}/wayfire-${version}.tar.xz";
sha256 = "0wc5szslgf8d4r4dlbfgc5v49j2ziaa8fycmknq4p0vl67mh7acq"; sha256 = "19k9nk5whql03ik66i06r4xgxk5v7mpdphjpv13hdw8ba48w73hd";
}; };
nativeBuildInputs = [ meson ninja pkg-config wayland ]; nativeBuildInputs = [ meson ninja pkg-config wayland ];

View file

@ -1,16 +1,14 @@
{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, wayland, wrapGAppsHook { stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, wrapGAppsHook
, gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell , gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wcm"; pname = "wcm";
version = "0.6.0"; version = "0.7.0";
src = fetchFromGitHub { src = fetchurl {
owner = "WayfireWM"; url = "https://github.com/WayfireWM/wcm/releases/download/v${version}/wcm-${version}.tar.xz";
repo = "wcm"; sha256 = "19za1fnlf5hz4n4mxxwqcr5yxp6mga9ah539ifnjnqrgvj19cjlj";
rev = "v${version}";
sha256 = "1b22gymqfn0c49nf39676q5bj25rxab874iayiq31cmn14r30dyg";
}; };
nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wf-config"; pname = "wf-config";
version = "0.6.0"; version = "0.7.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/WayfireWM/wf-config/releases/download/${version}/wf-config-${version}.tar.xz"; url = "https://github.com/WayfireWM/wf-config/releases/download/v${version}/wf-config-${version}.tar.xz";
sha256 = "1a5aqybhbp9dp4jygrm3gbkdap5qbd52y6ihfr4rm1cj37sckcn0"; sha256 = "1bas5gsbnf8jxkkxd95992chz8yk5ckgg7r09gfnmm7xi8w0pyy7";
}; };
nativeBuildInputs = [ meson ninja pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config ];

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wf-shell"; pname = "wf-shell";
version = "0.6.1"; version = "0.7.0";
# > Note to packagers: do not use the autogenerated "Source code" # > Note to packagers: do not use the autogenerated "Source code"
# > archives from GitHub, but the wf-shell-0.4.0.tar.xz file. # > archives from GitHub, but the wf-shell-0.4.0.tar.xz file.
src = fetchurl { src = fetchurl {
url = "https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz"; url = "https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz";
sha256 = "0jl8gj185k2ff754lcj5b5nldhkvrhmlaj8lsik4kx78vlb5m3ns"; sha256 = "1isybm9lcpxwyf6zh2vzkwrcnw3q7qxm21535g4f08f0l68cd5bl";
}; };
nativeBuildInputs = [ meson ninja pkg-config wayland ]; nativeBuildInputs = [ meson ninja pkg-config wayland ];