Merge pull request #284735 from Izorkin/update-gpg-tui

This commit is contained in:
Sandro
2024-01-30 11:09:05 +01:00
committed by GitHub
2 changed files with 3 additions and 2 deletions
+1
View File
@@ -37,6 +37,7 @@ with lib;
ghostscript = super.ghostscript.override { cupsSupport = false; x11Support = false; };
gjs = super.gjs.overrideAttrs { doCheck = false; installTests = false; }; # avoid test dependency on gtk3
gobject-introspection = super.gobject-introspection.override { x11Support = false; };
gpg-tui = super.gpg-tui.override { x11Support = false; };
gpsd = super.gpsd.override { guiSupport = false; };
graphviz = super.graphviz-nox;
gst_all_1 = super.gst_all_1 // {
+2 -2
View File
@@ -4,8 +4,6 @@
, fetchFromGitHub
, gpgme
, libgpg-error
, libxcb
, libxkbcommon
, pkg-config
, python3
, AppKit
@@ -13,6 +11,7 @@
, libiconv
, libobjc
, libresolv
, x11Support ? true, libxcb, libxkbcommon
}:
rustPlatform.buildRustPackage rec {
@@ -38,6 +37,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
gpgme
libgpg-error
] ++ lib.optionals x11Support [
libxcb
libxkbcommon
] ++ lib.optionals stdenv.isDarwin [