diff options
Diffstat (limited to 'pkgs/applications/window-managers/wayfire')
4 files changed, 34 insertions, 133 deletions
diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index c870d7aed78..8014be48649 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -1,66 +1,31 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, git +{ stdenv, lib, fetchurl, meson, ninja, pkg-config , cairo, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland , wayland-protocols, wf-config, wlroots }: -let - self = stdenv.mkDerivation rec { - pname = "wayfire"; - version = "0.4.0"; +stdenv.mkDerivation rec { + pname = "wayfire"; + version = "0.5.0"; - src = fetchFromGitHub { - owner = "WayfireWM"; - repo = "wayfire"; - rev = version; - sha256 = "01rfkb7m1b4d0a9ph9c9jzaa7q6xa91i2ygd3xcnkz35b35qcxn2"; - }; - - patches = [ - # Fix gles32 support with Nixpkgs' LibGL's glesv2.pc. Can be - # removed if <https://github.com/WayfireWM/wayfire/pull/496> is - # applied upstream. - (fetchpatch { - url = "https://github.com/WayfireWM/wayfire/commit/ca3c74d9f472e929bee45a89e40fe6351e9d0bf5.patch"; - sha256 = "0jl36z1n0vs4dzsxxp4n1wzlzcasm5hy12dpnr3c9gzwlvns3wk9"; - }) - - # The following three patches add support for plugins installed - # outside of Wayfire's prefix. Without these, Wayfire plugins - # would all have to be built in this derivation. All three - # patches can be removed if - # <https://github.com/WayfireWM/wayfire/pull/497> is applied - # upstream. - (fetchpatch { - url = "https://github.com/WayfireWM/wayfire/commit/b9a456c8304546bfb66a9474a47937180b2d2555.patch"; - sha256 = "1l6vsch5n8h6830bisnzdfjjrvp3q9hqml3hzb5d99lrmc3zcld8"; - }) - (fetchpatch { - url = "https://github.com/WayfireWM/wayfire/commit/4bc39424688b8919311bc7ceee9eae2374e4d521.patch"; - excludes = [ "subprojects/wf-config" ]; - sha256 = "1cqhzbqlwlz0gv5239bx29yfjfmfv0lwyb3qx4wcnwxc3f70vr64"; - }) - (fetchpatch { - url = "https://github.com/WayfireWM/wayfire/commit/39096c8b544d06addf88234a16a93f9a2aada07c.patch"; - sha256 = "0in6mcx045grbdxwzgckhyfvffq7xs5k1n3pij6fxh9ckjylpx5k"; - }) - ]; + src = fetchurl { + url = "https://github.com/WayfireWM/wayfire/releases/download/${version}/wayfire-${version}.tar.xz"; + sha256 = "1zispx756b3jvmiwli2vp92vkfyzv3zdkffw0bmzgryh7balsq58"; + }; - strictDeps = true; - nativeBuildInputs = [ meson ninja pkg-config wayland git ]; - buildInputs = [ - cairo libdrm libexecinfo libinput libjpeg libxkbcommon wayland - wayland-protocols wf-config wlroots - ]; + strictDeps = true; + nativeBuildInputs = [ meson ninja pkg-config wayland ]; + buildInputs = [ + cairo libdrm libexecinfo libinput libjpeg libxkbcommon wayland + wayland-protocols wf-config wlroots + ]; - mesonFlags = [ "--sysconfdir" "/etc" ]; + mesonFlags = [ "--sysconfdir" "/etc" ]; - meta = with lib; { - homepage = "https://wayfire.org/"; - description = "3D wayland compositor"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 ]; - platforms = platforms.unix; - }; + meta = with lib; { + homepage = "https://wayfire.org/"; + description = "3D wayland compositor"; + license = licenses.mit; + maintainers = with maintainers; [ qyliss wucke13 ]; + platforms = platforms.unix; }; -in -self +} diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index 7c246d9e0f7..d8ffe22d58c 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -1,36 +1,18 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, wayland +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, wayland , gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell }: stdenv.mkDerivation rec { pname = "wcm"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wcm"; rev = "v${version}"; - sha256 = "0irypa0814nmsmi9s8wxwfs507w41g41zjv8dkp0fdhg0429zxwa"; + sha256 = "1b22gymqfn0c49nf39676q5bj25rxab874iayiq31cmn14r30dyg"; }; - patches = [ - # The following three patches add support for loading Wayfire - # plugin metadata from outside of Wayfire's prefix. Remove if - # <https://github.com/WayfireWM/wcm/pull/18> is applied upstream. - (fetchpatch { - url = "https://github.com/WayfireWM/wcm/commit/8930ce96f51175947c42a605a520adc7282138ef.patch"; - sha256 = "10s3jikm99msxx73k6ccam8jlpdvvy379mifks4zmpfbag9ammrl"; - }) - (fetchpatch { - url = "https://github.com/WayfireWM/wcm/commit/07dfe16bf83ca3389ddfa8b1f90afee0a8c16135.patch"; - sha256 = "1hgqzqpf2anyhfb1bl4v3n2vwsw0w7far651p7aisn9vr6iqbmls"; - }) - (fetchpatch { - url = "https://github.com/WayfireWM/wcm/commit/0864c3d842ca1dfe6b2d25013941a7679d867458.patch"; - sha256 = "1z4zjl9al09wgb39gyc4g2ib5kkzppq37zla6ncmhmglis4l8arn"; - }) - ]; - strictDeps = true; nativeBuildInputs = [ meson ninja pkg-config wayland ]; buildInputs = [ diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix index 31e0b5a7a49..dad9c555f5e 100644 --- a/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -1,30 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config -, glm, libevdev, libxml2 -}: +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, glm, libevdev, libxml2 }: stdenv.mkDerivation rec { pname = "wf-config"; - version = "0.4.0"; + version = "0.5.0"; - src = fetchFromGitHub { - owner = "WayfireWM"; - repo = "wf-config"; - rev = version; - sha256 = "0pb2v71x0dv9s96wi20d9bc9rlxzr85rba7vny6751j7frqr4xf7"; + src = fetchurl { + url = "https://github.com/WayfireWM/wf-config/releases/download/0.5.0/wf-config-0.5.0.tar.xz"; + sha256 = "0xbvfy31pl6mj0nac921gqksyh6jb8ccap30p94lw6r6fb17wz57"; }; - patches = [ - # Modify wf::config::build_configuration to allow plugins - # installed outside of Wayfire's prefix. Otherwise, we'd have to - # build all Wayfire plugins in the wayfire derivation. Remove if - # <https://github.com/WayfireWM/wf-config/pull/25> is applied - # upstream. - (fetchpatch { - url = "https://github.com/WayfireWM/wf-config/commit/36578282f774d71eb8ebcd2dfc9d923eb70ac637.patch"; - sha256 = "152744xgi9ha135r7qfyivdl5cgcp9kik224ncwqv9a480m7nwj6"; - }) - ]; - strictDeps = true; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libevdev libxml2 ]; diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index 5bddd954f0d..2cb1c1f1a1c 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -1,50 +1,20 @@ -{ stdenv, lib, fetchurl, fetchpatch, meson, ninja, pkg-config, wayland, git +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git , alsaLib, gnome3, gtk-layer-shell, pulseaudio, wayfire, wf-config }: stdenv.mkDerivation rec { pname = "wf-shell"; - version = "0.4.0"; + version = "0.5.0"; # > Note to packagers: do not use the autogenerated "Source code" # > archives from GitHub, but the wf-shell-0.4.0.tar.xz file. src = fetchurl { url = "https://github.com/WayfireWM/wf-shell/releases/download/${version}/wf-shell-${version}.tar.xz"; - sha256 = "184sdbfqisz96r0k9dmp8vc1arw9bs7nhkv3pbv9pxkj5liya0xw"; + sha256 = "1w4jhy84v9ky9s1iw36msn8189a3pwkvvivyhl44pfc4fy31wj7s"; }; - patches = [ - # Use the wf::config::build_configuration API as modified by the - # corresponding wf-config patch. Remove if - # <https://github.com/WayfireWM/wf-shell/pull/52> is applied - # upstream. - (fetchpatch { - url = "https://github.com/WayfireWM/wf-shell/commit/078f7d845f39689906d008d857681416c312991a.patch"; - sha256 = "0bgkm9sv9y2y4iyhga453vnffbyi8zy2by3fkhakpjlrzx9qlzza"; - }) - - # Allow wf-shell to be installed into its own prefix, rather than - # wayfire's. Remove if - # <https://github.com/WayfireWM/wf-shell/pull/53> is applied - # upstream. - (fetchpatch { - url = "https://github.com/WayfireWM/wf-shell/commit/482f00455f0b0e08e3fffc844c865e43c80df84b.patch"; - sha256 = "0zcwgshdd5d03fnkz30nmpzv0xv3085iqjmn61r05bin8v2b2b2h"; - }) - - # Generate and install a wf-shell.pc file, so that other packages - # can find wf-shell's metadata directory, rather than assuming - # it's the same as Wayfire's. Remove if - # <https://github.com/WayfireWM/wf-shell/pull/54> is applied - # upstream. - (fetchpatch { - url = "https://github.com/WayfireWM/wf-shell/commit/2c97d63cde3fd683f3b4159f459a5116e1a539f3.patch"; - sha256 = "0pfi6x1ddm9bbhmy48bxmgvqpl754d3f7q91703mzfza0rlwpr4q"; - }) - ]; - strictDeps = true; - nativeBuildInputs = [ meson ninja pkg-config wayland git ]; + nativeBuildInputs = [ meson ninja pkg-config wayland ]; buildInputs = [ alsaLib gnome3.gtkmm gtk-layer-shell pulseaudio wayfire wf-config ]; |