From 230b2c992d9fb14e03d3977ce373d39152a74397 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Thu, 2 May 2024 21:56:45 +0800 Subject: [PATCH] ags: remove package It has been upstreamed into nixpkgs. --- pkgs/ags/default.nix | 74 ----------------------------------------- pkgs/ags/lib-path.patch | 26 --------------- pkgs/default.nix | 1 - 3 files changed, 101 deletions(-) delete mode 100644 pkgs/ags/default.nix delete mode 100644 pkgs/ags/lib-path.patch diff --git a/pkgs/ags/default.nix b/pkgs/ags/default.nix deleted file mode 100644 index 16a8c0a1..00000000 --- a/pkgs/ags/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -, meson -, ninja -, nodePackages -, pkg-config -, gobject-introspection -, gjs -, glib-networking -, gnome -, gtk-layer-shell -, libpulseaudio -, libsoup_3 -, networkmanager -, upower -, wrapGAppsHook -, linux-pam -}: - -buildNpmPackage rec { - pname = "ags"; - version = "1.8.0"; - - src = fetchFromGitHub { - owner = "Aylur"; - repo = "ags"; - rev = "v${version}"; - hash = "sha256-+0us1/lawDXp6RXn4ev95a99VgpsVPi2A4jwNS2O1Uo="; - fetchSubmodules = true; - }; - - npmDepsHash = "sha256-ucWdADdMqAdLXQYKGOXHNRNM9bhjKX4vkMcQ8q/GZ20="; - - mesonFlags = [ - (lib.mesonBool "build_types" true) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gjs - gobject-introspection - nodePackages.typescript - wrapGAppsHook - ]; - - # Most of the build inputs here are basically needed for their typelibs. - buildInputs = [ - gjs - glib-networking - gnome.gnome-bluetooth - gtk-layer-shell - libpulseaudio - libsoup_3 - linux-pam - networkmanager - upower - ]; - - postPatch = '' - chmod u+x ./post_install.sh && patchShebangs ./post_install.sh - ''; - - meta = with lib; { - homepage = "https://github.com/Aylur/ags"; - description = "A EWW-inspired widget system as a GJS library"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ foo-dogsquared ]; - mainProgram = "ags"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/ags/lib-path.patch b/pkgs/ags/lib-path.patch deleted file mode 100644 index f53ebe31..00000000 --- a/pkgs/ags/lib-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/meson.build b/meson.build -index 63b3e6d..62fc8b8 100644 ---- a/meson.build -+++ b/meson.build -@@ -16,7 +16,7 @@ subproject('gvc', - default_options: [ - 'package_name=' + APP, - 'pkgdatadir=' + get_option('datadir') / APP, -- 'pkglibdir=' + get_option('libdir') / APP, -+ 'pkglibdir=' + get_option('libdir'), - 'static=false', - 'introspection=true', - 'alsa=false' -diff --git a/src/meson.build b/src/meson.build -index 44ee0a5..d96615a 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -27,7 +27,7 @@ app_launcher = configure_file( - output : APP, - configuration: { - 'GJS': find_program('gjs').full_path(), -- 'GVC_GIR': get_option('prefix') / get_option('libdir') / APP, -+ 'GVC_GIR': get_option('prefix') / get_option('libdir'), - 'PACKAGE_NAME': APP, - 'PACKAGE_VERSION': meson.project_version(), - 'PREFIX': get_option('prefix'), diff --git a/pkgs/default.nix b/pkgs/default.nix index 05bbf14a..b01fc984 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,7 +2,6 @@ with pkgs; lib.makeScope newScope (self: { - ags = callPackage ./ags { }; awesome-cli = callPackage ./awesome-cli { }; base16-builder-go = callPackage ./base16-builder-go { }; blender-blendergis = python3Packages.callPackage ./blender-blendergis { };