diff --git a/pkgs/default.nix b/pkgs/default.nix index 1d299ce4..ac8d6e2d 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -6,30 +6,6 @@ let packages = self: let callPackage = newScope self; in { - poppler_21_08 = poppler.overrideAttrs (super: rec { - version = "21.08.0"; - src = fetchurl { - url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - sha256 = "sha256-6c9dxZZLzkuwJk0cT4EicGyRBYi0Ic/DCryX1rI+YC0="; - }; - }); - gstreamer_1_18_5 = gst_all_1.gstreamer.overrideAttrs (super: rec { - version = "1.18.5"; - src = fetchurl { - url = - "https://gstreamer.freedesktop.org/src/${super.pname}/${super.pname}-${version}.tar.xz"; - sha256 = "sha256-VYYiMqY0Wbv1ar694whcqa7CEbR46JHazqTW34yv6Ao="; - }; - }); - gstreamer_plugins_base_1_18_5 = gst_all_1.gst-plugins-base.overrideAttrs - (super: rec { - version = "1.18.5"; - src = fetchurl { - url = - "https://gstreamer.freedesktop.org/src/${super.pname}/${super.pname}-${version}.tar.xz"; - sha256 = "sha256-lgt69FhXANsP3VuENVThHiVk/tngYfWR+uiKe+ZEb6M="; - }; - }); blueprint-compiler = callPackage ./blueprint-compiler.nix { }; butler = callPackage ./butler.nix { }; devdocs-desktop = callPackage ./devdocs-desktop.nix { }; @@ -55,7 +31,6 @@ let pop-launcher = callPackage ./pop-launcher.nix { }; pop-launcher-plugin-duckduckgo-bangs = callPackage ./pop-launcher-plugin-duckduckgo-bangs.nix { }; - rnote = callPackage ./rnote.nix { }; tic-80 = callPackage ./tic-80 { }; segno = libsForQt5.callPackage ./segno.nix { }; sioyek = libsForQt5.callPackage ./sioyek.nix { }; diff --git a/pkgs/rnote.nix b/pkgs/rnote.nix deleted file mode 100644 index e0e403d8..00000000 --- a/pkgs/rnote.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, meson, ninja, pkg-config -, wrapGAppsHook, gtk4, glib, gstreamer_1_18_5, gstreamer_plugins_base_1_18_5 -, libadwaita, gobject-introspection, poppler_21_08, libxml2, appstream-glib -, desktop-file-utils, shared-mime-info }: - -stdenv.mkDerivation rec { - pname = "rnote"; - version = "0.2.5"; - - src = fetchFromGitHub { - owner = "flxzt"; - repo = "rnote"; - rev = "v${version}"; - sha256 = "sha256-4C0jsKmZeqzlEzJk9XLF41CZDFVsSklRmizY7N4zz+A="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - sha256 = "sha256-CvxUynDRnPGoqWxxzdZoQUys/kMwj3f9/IXVA4EqiNU="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - rustPlatform.cargoSetupHook - rustPlatform.rust.cargo - rustPlatform.rust.rustc - wrapGAppsHook - ]; - - buildInputs = [ - appstream-glib - desktop-file-utils - glib - gobject-introspection - gstreamer_1_18_5 - gstreamer_plugins_base_1_18_5 - gtk4 - libadwaita - libxml2 - poppler_21_08 - shared-mime-info - ]; - - postPatch = '' - patchShebangs build-aux/meson_post_install.py - ''; - - meta = with lib; { - description = "Simple freehand drawing note-taking application"; - homepage = "https://github.com/flxzt/rnote"; - license = licenses.gpl3; - }; -}