gcr: Clean up
* Format with nixpkgs-format * Correct license * Explicitly specify patched shebangs * Build in parallel * Drop unnecessary dependencies
This commit is contained in:
parent
7827d3f449
commit
b7b3d3a264
@ -1,7 +1,21 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, gettext, gnupg, p11-kit, glib
|
{ stdenv
|
||||||
, libgcrypt, libtasn1, dbus-glib, gtk3, pango, gdk-pixbuf, atk
|
, fetchurl
|
||||||
, gobject-introspection, makeWrapper, libxslt, vala, gnome3
|
, pkgconfig
|
||||||
, python3 }:
|
, gettext
|
||||||
|
, gnupg
|
||||||
|
, p11-kit
|
||||||
|
, glib
|
||||||
|
, libgcrypt
|
||||||
|
, libtasn1
|
||||||
|
, gtk3
|
||||||
|
, pango
|
||||||
|
, gobject-introspection
|
||||||
|
, makeWrapper
|
||||||
|
, libxslt
|
||||||
|
, vala
|
||||||
|
, gnome3
|
||||||
|
, python3
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gcr";
|
pname = "gcr";
|
||||||
@ -12,38 +26,59 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1hf06p4qfyywnb6334ysnr6aqxik3srb37glclvr4yhb3wzrjqnm";
|
sha256 = "1hf06p4qfyywnb6334ysnr6aqxik3srb37glclvr4yhb3wzrjqnm";
|
||||||
};
|
};
|
||||||
|
|
||||||
passthru = {
|
|
||||||
updateScript = gnome3.updateScript { packageName = pname; };
|
|
||||||
};
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs .
|
patchShebangs build/ gcr/fixtures/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig gettext gobject-introspection libxslt makeWrapper vala ];
|
nativeBuildInputs = [
|
||||||
|
pkgconfig
|
||||||
|
gettext
|
||||||
|
gobject-introspection
|
||||||
|
libxslt
|
||||||
|
makeWrapper
|
||||||
|
vala
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [ gnupg libgcrypt libtasn1 dbus-glib pango gdk-pixbuf atk ];
|
buildInputs = [
|
||||||
|
gnupg
|
||||||
|
libgcrypt
|
||||||
|
libtasn1
|
||||||
|
pango
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [ glib gtk3 p11-kit ];
|
propagatedBuildInputs = [
|
||||||
|
glib
|
||||||
|
gtk3
|
||||||
|
p11-kit
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
python3
|
||||||
|
];
|
||||||
|
|
||||||
checkInputs = [ python3 ];
|
|
||||||
doCheck = false; # fails 21 out of 603 tests, needs dbus daemon
|
doCheck = false; # fails 21 out of 603 tests, needs dbus daemon
|
||||||
|
|
||||||
#enableParallelBuilding = true; issues on hydra
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
wrapProgram "$out/bin/gcr-viewer" \
|
wrapProgram "$out/bin/gcr-viewer" \
|
||||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
passthru = {
|
||||||
|
updateScript = gnome3.updateScript {
|
||||||
|
packageName = pname;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = gnome3.maintainers;
|
maintainers = gnome3.maintainers;
|
||||||
description = "GNOME crypto services (daemon and tools)";
|
description = "GNOME crypto services (daemon and tools)";
|
||||||
homepage = https://gitlab.gnome.org/GNOME/gcr;
|
homepage = "https://gitlab.gnome.org/GNOME/gcr";
|
||||||
license = licenses.gpl2;
|
license = licenses.lgpl2Plus;
|
||||||
|
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
GCR is a library for displaying certificates, and crypto UI, accessing
|
GCR is a library for displaying certificates, and crypto UI, accessing
|
||||||
|
Loading…
x
Reference in New Issue
Block a user