diff options
Diffstat (limited to 'pkgs/data/misc')
-rw-r--r-- | pkgs/data/misc/cacert/setup-hook.sh | 6 | ||||
-rw-r--r-- | pkgs/data/misc/osinfo-db/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/misc/shared-mime-info/default.nix | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/data/misc/cacert/setup-hook.sh b/pkgs/data/misc/cacert/setup-hook.sh index 77b68a5c251..93b682fbbd1 100644 --- a/pkgs/data/misc/cacert/setup-hook.sh +++ b/pkgs/data/misc/cacert/setup-hook.sh @@ -1,3 +1,7 @@ export NIX_SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt -# left for compatibility + +# compatibility +# - openssl export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt +# - Haskell x509-system +export SYSTEM_CERTIFICATE_PATH=@out@/etc/ssl/certs/ca-bundle.crt diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index ec0fa407d73..17a63debdc6 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; - phases = [ "installPhase" ]; - installPhase = '' osinfo-db-import --dir "$out/share/osinfo" "${src}" ''; diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 63b8467e6cc..416bf009518 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -39,16 +39,16 @@ stdenv.mkDerivation rec { pkg-config gettext itstool - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ libxml2 - shared-mime-info - ]; + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) shared-mime-info; buildInputs = [ libxml2 glib ]; + strictDeps = true; + mesonFlags = [ "-Dupdate-mimedb=true" ]; |