diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-11-05 16:10:26 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-11-05 16:37:46 +0100 |
commit | b7b3d3a2641091146a20452a1c8ef026f8553e33 (patch) | |
tree | d7371e72a7815c7458c1888baff33d2aeb623714 /pkgs/development/libraries/gcr | |
parent | 7827d3f4497ed722fedca57fd4d5ca1a65c38256 (diff) | |
download | nixpkgs-b7b3d3a2641091146a20452a1c8ef026f8553e33.tar nixpkgs-b7b3d3a2641091146a20452a1c8ef026f8553e33.tar.gz nixpkgs-b7b3d3a2641091146a20452a1c8ef026f8553e33.tar.bz2 nixpkgs-b7b3d3a2641091146a20452a1c8ef026f8553e33.tar.lz nixpkgs-b7b3d3a2641091146a20452a1c8ef026f8553e33.tar.xz nixpkgs-b7b3d3a2641091146a20452a1c8ef026f8553e33.tar.zst nixpkgs-b7b3d3a2641091146a20452a1c8ef026f8553e33.zip |
gcr: Clean up
* Format with nixpkgs-format * Correct license * Explicitly specify patched shebangs * Build in parallel * Drop unnecessary dependencies
Diffstat (limited to 'pkgs/development/libraries/gcr')
-rw-r--r-- | pkgs/development/libraries/gcr/default.nix | 67 |
1 files changed, 51 insertions, 16 deletions
diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 1947d40dc85..dfe53668c79 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -1,7 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gnupg, p11-kit, glib -, libgcrypt, libtasn1, dbus-glib, gtk3, pango, gdk-pixbuf, atk -, gobject-introspection, makeWrapper, libxslt, vala, gnome3 -, python3 }: +{ stdenv +, fetchurl +, pkgconfig +, gettext +, gnupg +, p11-kit +, glib +, libgcrypt +, libtasn1 +, gtk3 +, pango +, gobject-introspection +, makeWrapper +, libxslt +, vala +, gnome3 +, python3 +}: stdenv.mkDerivation rec { pname = "gcr"; @@ -12,38 +26,59 @@ stdenv.mkDerivation rec { sha256 = "1hf06p4qfyywnb6334ysnr6aqxik3srb37glclvr4yhb3wzrjqnm"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = pname; }; - }; - postPatch = '' - patchShebangs . + patchShebangs build/ gcr/fixtures/ ''; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig gettext gobject-introspection libxslt makeWrapper vala ]; + nativeBuildInputs = [ + pkgconfig + gettext + gobject-introspection + libxslt + makeWrapper + vala + ]; + + buildInputs = [ + gnupg + libgcrypt + libtasn1 + pango + ]; - buildInputs = [ gnupg libgcrypt libtasn1 dbus-glib pango gdk-pixbuf atk ]; + 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 - #enableParallelBuilding = true; issues on hydra + enableParallelBuilding = true; preFixup = '' wrapProgram "$out/bin/gcr-viewer" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; description = "GNOME crypto services (daemon and tools)"; - homepage = https://gitlab.gnome.org/GNOME/gcr; - license = licenses.gpl2; + homepage = "https://gitlab.gnome.org/GNOME/gcr"; + license = licenses.lgpl2Plus; longDescription = '' GCR is a library for displaying certificates, and crypto UI, accessing |