From 95c02c72e9f8a6b4b21452d19763f68ece4476c5 Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Tue, 12 Mar 2024 02:17:21 +0100 Subject: [PATCH] Drop SRM and Louvre as they're now in nixpkgs --- packages/default.nix | 2 -- packages/louvre.nix | 79 ----------------------------------------- packages/srm-cuarzo.nix | 63 -------------------------------- 3 files changed, 144 deletions(-) delete mode 100644 packages/louvre.nix delete mode 100644 packages/srm-cuarzo.nix diff --git a/packages/default.nix b/packages/default.nix index 2aed5c5..9e07995 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -10,7 +10,6 @@ in { hello-kde = callPackage ./hello-kde.nix {}; kde-classic-svg = callPackage ./kde-classic-svg.nix {}; ksysguard = callPackage ./ksysguard {}; - louvre = callPackage ./louvre.nix {}; netmuxd = callPackage ./netmuxd {}; nix-pijul = callPackage ./nix-pijul.nix {}; nix-plugin-pijul = callPackage ./nix-plugin-pijul.nix {}; @@ -20,7 +19,6 @@ in { pterodactyl-daemon = callPackage ./pterodactyl-daemon.nix {}; pterodactyl-panel = callPackage ./pterodactyl-panel {}; smarttab-kak = callPackage ./smarttab-kak.nix {}; - srm-cuarzo = callPackage ./srm-cuarzo.nix {}; sys2x-tools = callPackage ./sys2x-tools {}; the-elder-scrolls-online = callPackage ./the-elder-scrolls-online.nix {}; win2unixpath = callPackage ./win2unixpath {}; diff --git a/packages/louvre.nix b/packages/louvre.nix deleted file mode 100644 index 5bf878d..0000000 --- a/packages/louvre.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - meson, - ninja, - pkg-config, - fontconfig, - freeimage, - icu, - libdrm, - libGL, - libinput, - libseat, - libX11, - libXcursor, - libxkbcommon, - mesa, - pixman, - srm-cuarzo, - udev, - wayland, - xorgproto, -}: -stdenv.mkDerivation (self: { - pname = "louvre"; - version = "1.0.1-1"; - rev = "v${self.version}"; - hash = "sha256-gKl9gGN2x7XGHxvRGUrZNZBsmpYh4as5fluUY26kkEo="; - - src = fetchFromGitHub { - inherit (self) rev hash; - owner = "CuarzoSoftware"; - repo = "Louvre"; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - fontconfig - freeimage - icu - libdrm - libGL - libinput - libseat - libX11 - libXcursor - libxkbcommon - mesa - pixman - srm-cuarzo - udev - wayland - xorgproto - ]; - - mesonFlags = [ - (lib.mesonOption "assets_path" "${placeholder "out"}/share/Louvre/assets") - (lib.mesonOption "backends_path" "${placeholder "out"}/lib/Louvre/backends") - ]; - - outputs = ["dev" "out"]; - - preConfigure = '' - cd src - ''; - - meta = { - description = "C++ library for building Wayland compositors"; - homepage = "https://github.com/CuarzoSoftware/Louvre"; - maintainers = [(import ../maintainer-info.nix)]; - platforms = lib.platforms.linux; - }; -}) diff --git a/packages/srm-cuarzo.nix b/packages/srm-cuarzo.nix deleted file mode 100644 index e613789..0000000 --- a/packages/srm-cuarzo.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - meson, - ninja, - pkg-config, - libdisplay-info, - libdrm, - libGL, - libinput, - libseat, - mesa, - udev, -}: -stdenv.mkDerivation (self: { - pname = "srm-cuarzo"; - version = "0.4.0-1"; - rev = "v${self.version}"; - hash = "sha256-PWtDSBYw62sfyN2lpd7NY8SbqDrt5IN1rdLZRtDfals="; - - src = fetchFromGitHub { - inherit (self) rev hash; - owner = "CuarzoSoftware"; - repo = "SRM"; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - libdisplay-info - libdrm - libGL - libinput - libseat - mesa - udev - ]; - - outputs = ["dev" "out"]; - - postPatch = '' - sed \ - -e "s,/usr/include/drm,${libdrm.dev}/include/drm," \ - -e "s,/usr/include/libdrm,${libdrm.dev}/include/libdrm," \ - -i src/meson.build - ''; - - preConfigure = '' - cd src - ''; - - meta = { - description = "Simple Rendering Manager"; - homepage = "https://github.com/CuarzoSoftware/SRM"; - maintainers = [(import ../maintainer-info.nix)]; - platforms = lib.platforms.linux; - }; -}) -- 2.45.2