diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2018-12-22 17:25:56 +0100 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2018-12-22 17:33:08 +0100 |
| commit | 25b80b62daddc52c24ab17bd8a423e48379b80a8 (patch) | |
| tree | 69a6233b4edd076e7a389792a0baa9c290b58d3c /pkgs/development/libraries/wlroots/default.nix | |
| parent | fef61378a1130c9fb25b18529fc87b97d7ee3072 (diff) | |
| download | nixpkgs-25b80b62daddc52c24ab17bd8a423e48379b80a8.tar nixpkgs-25b80b62daddc52c24ab17bd8a423e48379b80a8.tar.gz nixpkgs-25b80b62daddc52c24ab17bd8a423e48379b80a8.tar.bz2 nixpkgs-25b80b62daddc52c24ab17bd8a423e48379b80a8.tar.lz nixpkgs-25b80b62daddc52c24ab17bd8a423e48379b80a8.tar.xz nixpkgs-25b80b62daddc52c24ab17bd8a423e48379b80a8.tar.zst nixpkgs-25b80b62daddc52c24ab17bd8a423e48379b80a8.zip | |
wlroots: Remove the overrides for Meson
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).
Diffstat (limited to 'pkgs/development/libraries/wlroots/default.nix')
| -rw-r--r-- | pkgs/development/libraries/wlroots/default.nix | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index efe7214ab6a..92e8bded875 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -2,28 +2,11 @@ , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu , libpng, ffmpeg_4 -, python3Packages # TODO: Temporary }: let pname = "wlroots"; 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 { name = "${pname}-${version}"; @@ -43,7 +26,7 @@ in stdenv.mkDerivation rec { # programs (in examples) AND rootston outputs = [ "out" "bin" "examples" ]; - nativeBuildInputs = [ meson480 ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ wayland libGL wayland-protocols libinput libxkbcommon pixman |