From 8b3a1c0ed0cc4bf071aaf5ebd6b9b4d25dc4318f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 4 Oct 2019 02:08:00 +0200 Subject: [PATCH] wayland_1_9: remove ancient compat version, that no longer has any use was introduced > 3 yrs ago in https://github.com/NixOS/nixpkgs/commit/0593ad2b1613e22efa88307ee6ee4115563721fb --- pkgs/development/libraries/wayland/1.9.nix | 33 ---------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 35 deletions(-) delete mode 100644 pkgs/development/libraries/wayland/1.9.nix diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix deleted file mode 100644 index 7572051b1de0..000000000000 --- a/pkgs/development/libraries/wayland/1.9.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, pkgconfig -, libffi, libxml2 -, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) -}: - -# Require the optional to be enabled until upstream fixes or removes the configure flag -assert expat != null; - -stdenv.mkDerivation rec { - pname = "wayland"; - version = "1.9.0"; - - src = fetchurl { - url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww"; - }; - - configureFlags = [ "--with-scanner" "--disable-documentation" ]; - - nativeBuildInputs = [ pkgconfig ]; - - buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ]; - - meta = { - description = "Reference implementation of the wayland protocol"; - homepage = https://wayland.freedesktop.org/; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ codyopel ]; - }; - - passthru.version = version; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb906ed884ac..be4221d4b950 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14100,8 +14100,6 @@ in wayland = callPackage ../development/libraries/wayland { }; - wayland_1_9 = callPackage ../development/libraries/wayland/1.9.nix { }; - wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; waylandpp = callPackage ../development/libraries/waylandpp { };