From 5b191cfe0a0e0dc6dd7009abcb6e8f22c060bad6 Mon Sep 17 00:00:00 2001 From: Michael Francis Date: Fri, 26 Mar 2021 10:56:07 -0400 Subject: [PATCH 1/3] Added mime info path for mimemagic (cherry picked from commit cb7b5a0dfdf30747164204c69927df26af338111) --- pkgs/development/ruby-modules/gem-config/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index d9ece64caedd..1897f90344d5 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -25,7 +25,7 @@ , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk -, bundler, libsass, libselinux ? null, libsepol ? null +, bundler, libsass, libselinux ? null, libsepol ? null, shared-mime-info }@args: let @@ -378,6 +378,10 @@ in export HOME=$TMPDIR ''; }; + + mimemagic = attrs: { + FREEDESKTOP_MIME_TYPES_PATH="${shared-mime-info}"; + }; msgpack = attrs: { buildInputs = [ msgpack ]; From c4ea17ee27f48c032ae4265a507e8da6d860027f Mon Sep 17 00:00:00 2001 From: Michael Francis Date: Fri, 26 Mar 2021 10:58:35 -0400 Subject: [PATCH 2/3] remove whitespace (cherry picked from commit 75bc87f6f89552a5f3d75588394bf261d260eabf) --- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 1897f90344d5..a9fd406d634e 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -378,7 +378,7 @@ in export HOME=$TMPDIR ''; }; - + mimemagic = attrs: { FREEDESKTOP_MIME_TYPES_PATH="${shared-mime-info}"; }; From f57ce8cbda1bd4d78220fa821cc39f955f4170f9 Mon Sep 17 00:00:00 2001 From: Michael Francis Date: Sat, 27 Mar 2021 04:51:32 +0800 Subject: [PATCH 3/3] Update pkgs/development/ruby-modules/gem-config/default.nix Co-authored-by: Sandro (cherry picked from commit d369e8534151fb9ebe54f1fc2e4f6fa73ff298e3) --- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index a9fd406d634e..8c6ee465b01c 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -380,7 +380,7 @@ in }; mimemagic = attrs: { - FREEDESKTOP_MIME_TYPES_PATH="${shared-mime-info}"; + FREEDESKTOP_MIME_TYPES_PATH="${shared-mime-info}/share/mime/packages/freedesktop.org.xml"; }; msgpack = attrs: {