about summary refs log tree commit diff
path: root/pkgs/applications/editors
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2020-01-28 14:44:08 -0500
committerGitHub <noreply@github.com>2020-01-28 14:44:08 -0500
commitfb36553584e1f07d5aa244ac44fc215ce4c51b2b (patch)
tree7d21e895438378c6e0945858460d8b0d5549a196 /pkgs/applications/editors
parent9300e2038d15b1f9639e119e26d6f4b7e523d56f (diff)
parent03aa58fed6be430e0e2c56c2dd86d967f7ffe132 (diff)
downloadnixlib-fb36553584e1f07d5aa244ac44fc215ce4c51b2b.tar
nixlib-fb36553584e1f07d5aa244ac44fc215ce4c51b2b.tar.gz
nixlib-fb36553584e1f07d5aa244ac44fc215ce4c51b2b.tar.bz2
nixlib-fb36553584e1f07d5aa244ac44fc215ce4c51b2b.tar.lz
nixlib-fb36553584e1f07d5aa244ac44fc215ce4c51b2b.tar.xz
nixlib-fb36553584e1f07d5aa244ac44fc215ce4c51b2b.tar.zst
nixlib-fb36553584e1f07d5aa244ac44fc215ce4c51b2b.zip
Merge pull request #78397 from sternenseemann/uberwriter-bugfix
uberwriter: add shared-mime-info to environment and update
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r--pkgs/applications/editors/uberwriter/default.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/editors/uberwriter/default.nix b/pkgs/applications/editors/uberwriter/default.nix
index ac3fb920da05..48ebc79e7050 100644
--- a/pkgs/applications/editors/uberwriter/default.nix
+++ b/pkgs/applications/editors/uberwriter/default.nix
@@ -2,7 +2,7 @@
 , wrapGAppsHook, pkgconfig, desktop-file-utils
 , appstream-glib, pythonPackages, glib, gobject-introspection
 , gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive
-, haskellPackages}:
+, shared-mime-info, haskellPackages}:
 
 let
   pythonEnv = pythonPackages.python.withPackages(p: with p;
@@ -11,13 +11,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "uberwriter";
-  version = "unstable-2019-11-29";
+  version = "unstable-2020-01-24";
 
   src = fetchFromGitHub {
     owner  = pname;
     repo   = pname;
-    rev    = "7606a55389f8516d9fed7927fa50ff8822ee9e38";
-    sha256 = "0ky001vs9nfvqf05h4q7fl0n8vsgim59z22i66a8sw6bqipv62sg";
+    rev    = "0647b413407eb8789a25c353602c4ac979dc342a";
+    sha256 = "19z52fpbf0p7dzx7q0r5pk3nn0c8z69g1hv6db0cqp61cqv5z95q";
   };
 
   nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils
@@ -41,6 +41,7 @@ in stdenv.mkDerivation rec {
       --prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/"
       --prefix PATH : "${texliveDist}/bin"
       --prefix PATH : "${haskellPackages.pandoc-citeproc}/bin"
+      --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
     )
   '';