diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-01-27 10:31:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-27 10:31:43 +0100 |
| commit | ec481f03510db7f955095ab009813d447947fd50 (patch) | |
| tree | ce8a2f156064eccbe209afc9776d7576922088ca | |
| parent | 089fa2e1131765839c058c8cdd08b28d2e693995 (diff) | |
| download | nixpkgs-ec481f03510db7f955095ab009813d447947fd50.tar nixpkgs-ec481f03510db7f955095ab009813d447947fd50.tar.gz nixpkgs-ec481f03510db7f955095ab009813d447947fd50.tar.bz2 nixpkgs-ec481f03510db7f955095ab009813d447947fd50.tar.lz nixpkgs-ec481f03510db7f955095ab009813d447947fd50.tar.xz nixpkgs-ec481f03510db7f955095ab009813d447947fd50.tar.zst nixpkgs-ec481f03510db7f955095ab009813d447947fd50.zip | |
Revert "wlroots: backport patch for free() of ununitialized"
| -rw-r--r-- | pkgs/development/libraries/wlroots/default.nix | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 3cda67bce4f..9d03d193d81 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -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; |