From a47008cfa0a0206baff2ed62af2c5d2bccaa8e7d Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 26 Feb 2016 18:51:23 +0100
Subject: machines/katara: different temporary libreoffice

Uses a custom nixpkgs Github rev clone now instead of copying the files
over and having to recompile.
---
 machines/profpatsch/katara.nix | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

(limited to 'machines/profpatsch/katara.nix')

diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix
index 1c6e1b03..f077c322 100644
--- a/machines/profpatsch/katara.nix
+++ b/machines/profpatsch/katara.nix
@@ -6,23 +6,13 @@ let
   mytexlive = with pkgs.texlive; combine { inherit scheme-medium minted units collection-bibtexextra; };
 
   tmpLibreOffice = with pkgs;
-    callPackage ./libreoffice {
-      inherit (perlPackages) ArchiveZip CompressZlib;
-      inherit (gnome) GConf ORBit2 gnome_vfs;
-      zip = zip.override { enableNLS = false; };
-      #glm = glm_0954;
-      bluez5 = bluez5_28;
-      fontsConf = makeFontsConf {
-        fontDirectories = [
-          freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
-        ];
-      };
-      clucene_core = clucene_core_2;
-      lcms = lcms2;
-      harfbuzz = harfbuzz.override {
-        withIcu = true; withGraphite2 = true;
-      };
-    };
+    (import (pkgs.fetchFromGitHub {
+        owner = "NixOS";
+        repo = "nixpkgs";
+        rev = "eea1e003dd6c472c560999f249bd7aa65675a890";
+        sha256 = "000wjkgib5rri63dyz6y9wih7g306a87y37l62ni4zigfkyfyl56";
+      }) { inherit (config.nixpkgs) config;
+    }).libreoffice;
 
 in {
 
-- 
cgit 1.4.1