public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #67390 from primeos/weston

Browse Source 
weston: 6.0.1 -> 7.0.0
This commit is contained in:
Marek Mahut
2019-08-25 14:22:29 +02:00
committed by GitHub
parent ee099bf5e7 1a8ea5cead
commit cceab5257f
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/window-managers/weston/default.nix
+5 -4
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig { stdenv, fetchurl, meson, ninja, pkgconfig
, wayland, libGL, mesa, libxkbcommon, cairo, libxcb , wayland, libGL, mesa, libxkbcommon, cairo, libxcb
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev
, colord, lcms2 , colord, lcms2, pipewire ? null
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
, libwebp ? null, xwayland ? null, wayland-protocols , libwebp ? null, xwayland ? null, wayland-protocols
# beware of null defaults, as the parameters *are* supplied by callPackage by default # beware of null defaults, as the parameters *are* supplied by callPackage by default
@@ -10,11 +10,11 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "weston"; pname = "weston";
version = "6.0.1"; version = "7.0.0";
src = fetchurl { src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
sha256 = "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz"; sha256 = "0r4sj11hq4brv3ryrgp2wmkkfz1h59vh9ih18igzjibagch6s2m0";
}; };
nativeBuildInputs = [ meson ninja pkgconfig ]; nativeBuildInputs = [ meson ninja pkgconfig ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva
libwebp wayland-protocols libwebp wayland-protocols
colord lcms2 colord lcms2 pipewire
]; ];
mesonFlags= [ mesonFlags= [
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
"-Dbackend-rdp=${boolToString (freerdp != null)}" "-Dbackend-rdp=${boolToString (freerdp != null)}"
"-Dxwayland=${boolToString (xwayland != null)}" # Default is true! "-Dxwayland=${boolToString (xwayland != null)}" # Default is true!
"-Dremoting=false" # TODO "-Dremoting=false" # TODO
"-Dpipewire=${boolToString (pipewire != null)}"
"-Dimage-webp=${boolToString (libwebp != null)}" "-Dimage-webp=${boolToString (libwebp != null)}"
"-Dsimple-dmabuf-drm=" # Disables all drivers "-Dsimple-dmabuf-drm=" # Disables all drivers
"-Ddemo-clients=false" "-Ddemo-clients=false"
pkgs/development/libraries/wayland/protocols.nix
+2 -2
View File
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wayland-protocols"; pname = "wayland-protocols";
version = "1.17"; version = "1.18";
src = fetchurl { src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
sha256 = "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz"; sha256 = "1cvl93h83ymbfhb567jv5gzyq08181w7c46rsw4xqqqpcvkvfwrx";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
pkgs/top-level/all-packages.nix
+1
View File
@@ -21220,6 +21220,7 @@ in
libva = null; libva = null;
libwebp = null; libwebp = null;
xwayland = null; xwayland = null;
pipewire = null;
}; };
chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {};