ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 15:36:47 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #212924 from NixOS/revert-212298-pr/wlroots/fixbuild

Browse Source 
Revert "wlroots: backport patch for free() of ununitialized"
This commit is contained in:
Weijia Wang 2023-01-27 10:32:00 +01:00 committed by GitHub
commit bd136f49ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;