public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wlroots: Remove the overrides for Meson

Browse Source 
These overrides aren't required anymore as Meson 0.48.2 is now in
nixpkgs and there aren't any big problems so far (i.e. a revert is
unlikely).
This commit is contained in:
Michael Weiss 2018-12-22 17:25:56 +01:00
parent fef61378a1
commit 25b80b62da
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,28 +2,11 @@
, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu
, libpng, ffmpeg_4 , libpng, ffmpeg_4
, python3Packages # TODO: Temporary
}: }:
let let
pname = "wlroots"; pname = "wlroots";
version = "0.2"; version = "0.2";
meson480 = meson.overrideAttrs (oldAttrs: rec {
name = pname + "-" + version;
pname = "meson";
version = "0.48.0";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0qawsm6px1vca3babnqwn0hmkzsxy4w0gi345apd2qk3v0cv7ipc";
};
# Remove gir-fallback-path.patch and
# a87496addd9160300837aa50193f4798c6f1d251.patch (already in 0.48.0):
patches = builtins.filter
(str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str
|| stdenv.lib.hasSuffix "a87496addd9160300837aa50193f4798c6f1d251.patch" str))
oldAttrs.patches;
});
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -43,7 +26,7 @@ in stdenv.mkDerivation rec {
# programs (in examples) AND rootston # programs (in examples) AND rootston
outputs = [ "out" "bin" "examples" ]; outputs = [ "out" "bin" "examples" ];
nativeBuildInputs = [ meson480 ninja pkgconfig ]; nativeBuildInputs = [ meson ninja pkgconfig ];
buildInputs = [ buildInputs = [
wayland libGL wayland-protocols libinput libxkbcommon pixman wayland libGL wayland-protocols libinput libxkbcommon pixman