From 038b89819b94e509d5ba32707406e6b8df6802ee Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 3 Feb 2019 11:46:46 +0100 Subject: [PATCH] wlroots: 0.2 -> 0.3 --- pkgs/development/libraries/wlroots/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 92e8bded8755..d25f1d0b4c8d 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -6,7 +6,7 @@ let pname = "wlroots"; - version = "0.2"; + version = "0.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -14,14 +14,9 @@ in stdenv.mkDerivation rec { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "0gfxawjlb736xl90zfv3n6zzf5n1cacgzflqi1zq1wn7wd3j6ppv"; + sha256 = "1iz5lxpiba1lcmkz3hz56r8j6ra3535zgckazqshi4c364nx94zs"; }; - postPatch = '' - substituteInPlace meson.build \ - --replace "version: '0.1.0'" "version: '${version}.0'" - ''; - # $out for the library, $bin for rootston, and $examples for the example # programs (in examples) AND rootston outputs = [ "out" "bin" "examples" ]; @@ -39,6 +34,11 @@ in stdenv.mkDerivation rec { "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled" ]; + postPatch = '' + # It happens from time to time that the version wasn't updated: + sed -iE "s/version: '[0-9]\.[0-9]\.[0-9]'/version: '${version}.0'/" meson.build + ''; + postInstall = '' # Install rootston (the reference compositor) to $bin and $examples for output in "$bin" "$examples"; do