diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-06-19 19:22:30 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-06-19 19:22:30 +0000 |
commit | 6c3ffdc228a9808c65a0205cd1fd404578d02dee (patch) | |
tree | c5998bfbac1bc92dace314e051164f830976d661 /nixpkgs/pkgs/development/libraries/gsignond | |
parent | ef93931efff0323fd13c4270415b578c73b5ef35 (diff) | |
parent | 83ba5afcc9682b52b39a9a958f730b966cc369c5 (diff) | |
download | nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.gz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.bz2 nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.lz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.xz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.zst nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.zip |
Merge commit '83ba5afcc9682b52b39a9a958f730b966cc369c5'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gsignond')
4 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gsignond/default.nix b/nixpkgs/pkgs/development/libraries/gsignond/default.nix index a81e72bf66fb..88a4ecb36225 100644 --- a/nixpkgs/pkgs/development/libraries/gsignond/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsignond/default.nix @@ -61,7 +61,7 @@ unwrapped = stdenv.mkDerivation rec { in if plugins == [] then unwrapped else import ./wrapper.nix { - inherit stdenv makeWrapper symlinkJoin gsignondPlugins plugins; + inherit makeWrapper symlinkJoin plugins; gsignond = unwrapped; } diff --git a/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix index 6182ea283cba..887376d31874 100644 --- a/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, check +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, check , json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 , docbook_xsl, glibcLocales, gobject-introspection }: diff --git a/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix b/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix index d1fa37939a78..655f73931f67 100644 --- a/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, gsasl, check +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, gsasl, check , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/libraries/gsignond/wrapper.nix b/nixpkgs/pkgs/development/libraries/gsignond/wrapper.nix index 04463aac3796..a4738e4b6a73 100644 --- a/nixpkgs/pkgs/development/libraries/gsignond/wrapper.nix +++ b/nixpkgs/pkgs/development/libraries/gsignond/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, symlinkJoin, gsignond, gsignondPlugins, plugins }: +{ makeWrapper, symlinkJoin, gsignond, plugins }: symlinkJoin { name = "gsignond-with-plugins-${gsignond.version}"; |