forked from mirrors/nixpkgs
Merge pull request #212924 from NixOS/revert-212298-pr/wlroots/fixbuild
Revert "wlroots: backport patch for free() of ununitialized"
This commit is contained in:
commit
bd136f49ad
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch2
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
@ -28,7 +27,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "", patches ? [ ] }:
|
||||
generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "" }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wlroots";
|
||||
inherit version;
|
||||
|
@ -41,7 +40,6 @@ let
|
|||
inherit hash;
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
postPatch = extraPatch;
|
||||
|
||||
# $out for the library and $examples for the example programs (in examples):
|
||||
|
@ -131,13 +129,6 @@ rec {
|
|||
substituteInPlace backend/drm/meson.build \
|
||||
--replace /usr/share/hwdata/ ${hwdata}/share/hwdata/
|
||||
'';
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
# render/egl: fix uninitialized pointers in init_dmabuf_formats
|
||||
url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/ed71915742160f2b9157adbad79364e22ab7ebda.patch";
|
||||
hash = "sha256-nNE+mBfLG3Q8PC3ly8GZXQZcoIoBLbcet7nxip6Ut0w=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
wlroots = wlroots_0_15;
|
||||
|
|
Loading…
Reference in a new issue