diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
| commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
| tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/development/libraries/gpgme | |
| parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
| parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
| download | nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.zip | |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/development/libraries/gpgme')
| -rw-r--r-- | pkgs/development/libraries/gpgme/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 8d8b9a914943..c60311423233 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -5,10 +5,8 @@ assert useGnupg1 -> gnupg1 != null; assert !useGnupg1 -> gnupg != null; let - gpgPath = if useGnupg1 then - "${gnupg1}/bin/gpg" - else - "${gnupg}/bin/gpg2"; + gpgStorePath = if useGnupg1 then gnupg1 else gnupg; + gpgProgram = if useGnupg1 then "gpg" else "gpg2"; in stdenv.mkDerivation rec { name = "gpgme-1.6.0"; @@ -25,7 +23,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gnupg ]; - configureFlags = "--with-gpg=${gpgPath}"; + configureFlags = [ + "--with-gpg=${gpgStorePath}/bin/${gpgProgram}" + "--enable-fixed-path=${gpgStorePath}/bin" + ]; meta = with stdenv.lib; { homepage = "http://www.gnupg.org/related_software/gpgme"; |