diff options
author | Profpatsch <mail@profpatsch.de> | 2016-02-26 18:51:23 +0100 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2016-02-26 18:51:23 +0100 |
commit | a47008cfa0a0206baff2ed62af2c5d2bccaa8e7d (patch) | |
tree | e0b8e5e0a33bfa1b28e8c100a6ba36dbfd426941 /machines/profpatsch/katara.nix | |
parent | 64c2424851d4618d3f3ef79d943ef2384b7d0945 (diff) |
machines/katara: different temporary libreoffice
Uses a custom nixpkgs Github rev clone now instead of copying the files over and having to recompile.
Diffstat (limited to 'machines/profpatsch/katara.nix')
-rw-r--r-- | machines/profpatsch/katara.nix | 24 |
1 files changed, 7 insertions, 17 deletions
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 { |