Merge staging-next into staging

2021-04-30 18:26:34 +00:00
parent 17305d2df0 28b0400c8e
commit 20ebbe6b59
37 changed files with 594 additions and 116 deletions
@@ -8,20 +8,15 @@

 stdenv.mkDerivation rec {
  pname = "cage";
-  version = "0.1.2.1";
+  version = "0.1.3";

  src = fetchFromGitHub {
    owner = "Hjdskes";
    repo = "cage";
    rev = "v${version}";
-    sha256 = "1i4rm3dpmk7gkl6hfs6a7vwz76ba7yqcdp63nlrdbnq81m9cy2am";
+    sha256 = "0ixl45g0m8b75gvbjm3gf5qg0yplspgs0xpm2619wn5sygc47sb1";
  };

-  postPatch = ''
-    substituteInPlace meson.build --replace \
-      "0.1.2" "${version}"
-  '';
-
  nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ];

  buildInputs = [