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

Merge pull request #31375 from dywedir/sway 

sway: 0.14.0 -> 0.15.0
wlc: 0.0.10 -> 0.0.11
This commit is contained in:
Michael Weiss 2017-11-08 12:46:30 +01:00 committed by GitHub
parent 292f60504c ffa60968a3
commit 9413521682
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,13 +8,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sway-${version}"; name = "sway-${version}";
version = "0.14.0"; version = "0.15.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Sircmpwn"; owner = "swaywm";
repo = "sway"; repo = "sway";
rev = "${version}"; rev = version;
sha256 = "1l8v9cdzd44bm4q71d47vqg6933b8j42q1a61r362vz2la1rcpq2"; sha256 = "0rz5rgap2ah7hkk4glvlmjq0c8i2f47qzkwjx7gm4wmb8gymikmh";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

16
pkgs/development/libraries/wlc/default.nix
View File

@ -5,28 +5,18 @@
, withOptionalPackages ? true, zlib, valgrind, doxygen , withOptionalPackages ? true, zlib, valgrind, doxygen
}: }:
let stdenv.mkDerivation rec {
# for 0.0.10
xwaylandPatch = fetchpatch {
url = "https://github.com/Cloudef/wlc/commit/a130f6006560fb8ac02fb59a90ced1659563f9ca.diff";
sha256 = "0kzcbqklcyg8bganm65di8cif6dpc8bkrsvkjia09kr92lymxm2c";
};
in stdenv.mkDerivation rec {
name = "wlc-${version}"; name = "wlc-${version}";
version = "0.0.10"; version = "0.0.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Cloudef"; owner = "Cloudef";
repo = "wlc"; repo = "wlc";
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "09kvwhrpgkxlagn9lgqxc80jbg56djn29a6z0n6h0dsm90ysyb2k"; sha256 = "1qnak907gjd35hq4b0rrhgb7kz5iwnirh8yk372yzxpgk7dq0gz9";
}; };
patches = [
xwaylandPatch
];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ buildInputs = [