diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-01-31 19:32:23 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-01-31 19:34:57 +0100 |
commit | dbae4f109f0ab3f676c8aa104d1f9bebcee85324 (patch) | |
tree | 18c61fd667b95bf3a3322e5f40161d2028b3e42c /pkgs/applications/misc/xca/default.nix | |
parent | 5dab625862a5690a35c122f3749eee31879a2415 (diff) | |
parent | b50cabf2d4c1175da48af4df3132b246aa1c8d12 (diff) | |
download | nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.gz nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.bz2 nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.lz nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.xz nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.zst nixlib-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.zip |
Merge branch 'master' into staging
Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
Diffstat (limited to 'pkgs/applications/misc/xca/default.nix')
-rw-r--r-- | pkgs/applications/misc/xca/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index be99439c6178..d5fa5e5ec56d 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1fn6kh8mdy65rrgjif7j9wn3mxg1mrrcnhzpi86hfy24ic6bahk8"; }; + patches = [ ./0001-Fix-for-openssl-1.0.1i.patch ]; + configurePhase = '' export PATH=$PATH:${which}/bin export QTDIR=${qt4} |