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

Merge pull request #103145 from primeos/wlroots

Browse Source 
wlroots: 0.11.0 -> 0.12.0
This commit is contained in:
Michael Weiss 2020-11-08 22:52:29 +01:00 committed by GitHub
commit 420daef820
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/window-managers/sway/default.nix
View File

@ -22,7 +22,9 @@ stdenv.mkDerivation rec {
];
postPatch = ''
substituteInPlace meson.build --replace "v1.5" "1.5"
substituteInPlace meson.build \
--replace "v1.5" "1.5" \
--replace "wlroots_version = ['>=0.11.0', '<0.12.0']" "wlroots_version = ['>=0.11.0', '<0.13.0']"
'';
nativeBuildInputs = [

6
pkgs/development/libraries/wlroots/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "wlroots";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "swaywm";
repo = "wlroots";
rev = version;
sha256 = "08d5d52m8wy3imfc6mdxpx8swhh2k4s1gmfaykg02j59z84awc6p";
sha256 = "01j38lmgs2c6fq68v8b75pkilia2wsgzgp46ivfbi9hhx47kgcfn";
};
# $out for the library and $examples for the example programs (in examples):
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
libpng ffmpeg
];
mesonFlags = [ "-Dlogind-provider=systemd" ];
mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ];
postFixup = ''
# Install ALL example programs to $examples: