diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-11 21:49:49 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 20:19:00 +0200 |
| commit | f8ce44d518a2d41d0a5105eb13ee1818e01bc130 (patch) | |
| tree | 9386532f62b21baebf157130ff803047a5ef0dfe | |
| parent | 14332a282cae9ea6a115d653b4ff70c5f525cc5f (diff) | |
| download | nixlib-f8ce44d518a2d41d0a5105eb13ee1818e01bc130.tar nixlib-f8ce44d518a2d41d0a5105eb13ee1818e01bc130.tar.gz nixlib-f8ce44d518a2d41d0a5105eb13ee1818e01bc130.tar.bz2 nixlib-f8ce44d518a2d41d0a5105eb13ee1818e01bc130.tar.lz nixlib-f8ce44d518a2d41d0a5105eb13ee1818e01bc130.tar.xz nixlib-f8ce44d518a2d41d0a5105eb13ee1818e01bc130.tar.zst nixlib-f8ce44d518a2d41d0a5105eb13ee1818e01bc130.zip | |
gpgme: split dev and info outputs
| -rw-r--r-- | pkgs/development/libraries/gpgme/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 1657ceaeece6..8d8b9a914943 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -18,17 +18,20 @@ stdenv.mkDerivation rec { sha256 = "17892sclz3yg45wbyqqrzzpq3l0icbnfl28f101b3062g8cy97dh"; }; + outputs = [ "dev" "out" "info" ]; + outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool + propagatedBuildInputs = [ libgpgerror glib libassuan pth ]; nativeBuildInputs = [ pkgconfig gnupg ]; configureFlags = "--with-gpg=${gpgPath}"; - meta = { + meta = with stdenv.lib; { homepage = "http://www.gnupg.org/related_software/gpgme"; description = "Library for making GnuPG easier to use"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.fuuzetsu ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3e816039388..b1d5acb22224 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -395,7 +395,7 @@ let postInstall = '' wrapProgram $out/bin/alot \ - --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file}/lib:${pkgs.gpgme}/lib + --prefix LD_LIBRARY_PATH : '${lib.makeLibraryPath [ pkgs.notmuch pkgs.file pkgs.gpgme ]}' ''; meta = { |