diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-31 01:30:15 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-31 01:34:58 +0200 |
commit | 55932c1beca26c7b5b7c259d95f6eb80644150a7 (patch) | |
tree | a2faafd73c3dcda7418278961a6ddf41d6d33d5c /pkgs/applications/graphics/shotwell | |
parent | 23562aad59048e8e1202e618fcf402079f1593b8 (diff) | |
download | nixpkgs-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar nixpkgs-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar.gz nixpkgs-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar.bz2 nixpkgs-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar.lz nixpkgs-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar.xz nixpkgs-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar.zst nixpkgs-55932c1beca26c7b5b7c259d95f6eb80644150a7.zip |
Don't statically depend on cacert for certificates
This reverts commit cd52c044568bdf1108428698048a9af92dc0b625 and others. Managing certificates (including revoking certificates and adding custom certificates) becomes extremely painful if every package in the system potentially depends on a different copy of cacert. Also, it makes updating cacert rather expensive.
Diffstat (limited to 'pkgs/applications/graphics/shotwell')
-rw-r--r-- | pkgs/applications/graphics/shotwell/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 2b25f8d41f6..052ba9402be 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite , webkitgtk24x, pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib , gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, makeWrapper -, gnome_doc_utils, hicolor_icon_theme, cacert }: +, gnome_doc_utils, hicolor_icon_theme }: # for dependencies see http://www.yorba.org/projects/shotwell/install/ @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { }; NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; - + configureFlags = [ "--disable-gsettings-convert-install" ]; - + preConfigure = '' patchShebangs . ''; |