Merge pull request #18682 from chris-martin/libreoffice-fetch

libreoffice: add nix shells for source generation
This commit is contained in:
Michael Raskin 2016-09-17 05:19:53 +00:00 committed by GitHub
commit ad2d4f583c
9 changed files with 116 additions and 25 deletions

View file

@ -0,0 +1,10 @@
LibreOffice
===========
To generate `libreoffice-srcs.nix`:
nix-shell default-gen-shell.nix --run generate
To generate `libreoffice-srcs-still.nix`:
nix-shell still-gen-shell.nix --run generate

View file

@ -0,0 +1,27 @@
{ pkgs ? (import <nixpkgs> {}) }:
with pkgs;
let
primary-src = callPackage ./default-primary-src.nix {};
in
stdenv.mkDerivation {
name = "generate-libreoffice-srcs-shell";
buildCommand = "exit 1";
downloadList = stdenv.mkDerivation {
name = "libreoffice-${primary-src.version}-download-list";
inherit (primary-src) src version;
builder = ./download-list-builder.sh;
};
shellHook = ''
function generate {
./generate-libreoffice-srcs.sh | tee libreoffice-srcs.nix
}
'';
}

View file

@ -0,0 +1,17 @@
{ fetchurl }:
rec {
major = "5";
minor = "2";
patch = "1";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "14g2xwpid4vsgmc69rs7hz1wx96dfkq0cbm32vjgljsm7a19qfc1";
};
}

View file

@ -18,15 +18,15 @@
, kdeIntegration ? false
}:
let
primary-src = import ./default-primary-src.nix { inherit fetchurl; };
in
with { inherit (primary-src) major minor subdir version; };
let
lib = stdenv.lib;
langsSpaces = lib.concatStringsSep " " langs;
major = "5";
minor = "2";
patch = "1";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl {
inherit name md5;
@ -64,10 +64,7 @@ let
in stdenv.mkDerivation rec {
name = "libreoffice-${version}";
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "14g2xwpid4vsgmc69rs7hz1wx96dfkq0cbm32vjgljsm7a19qfc1";
};
inherit (primary-src) src;
# Openoffice will open libcups dynamically, so we link it directly
# to make its dlopen work.

View file

@ -0,0 +1,3 @@
source $stdenv/setup
tar --extract --file=$src libreoffice-$version/download.lst -O > $out

View file

@ -2,10 +2,6 @@
# Ideally we would move as much as possible into derivation dependencies
# Take the list of files from the main package, ooo.lst.in
# This script wants an argument: download list file
cat <<EOF
[
EOF
@ -22,7 +18,7 @@ write_entry(){
}
saved_line=
cat "$(dirname "$0")/libreoffice-srcs-additions.sh" "$@" |
cat "$(dirname "$0")/libreoffice-srcs-additions.sh" "$downloadList" |
while read line; do
case "$line" in
EVAL\ *)

View file

@ -0,0 +1,27 @@
{ pkgs ? (import <nixpkgs> {}) }:
with pkgs;
let
primary-src = callPackage ./still-primary-src.nix {};
in
stdenv.mkDerivation {
name = "generate-libreoffice-srcs-shell";
buildCommand = "exit 1";
downloadList = stdenv.mkDerivation {
name = "libreoffice-${primary-src.version}-download-list";
inherit (primary-src) src version;
builder = ./download-list-builder.sh;
};
shellHook = ''
function generate {
./generate-libreoffice-srcs.sh | tee libreoffice-srcs-still.nix
}
'';
}

View file

@ -0,0 +1,17 @@
{ fetchurl }:
rec {
major = "5";
minor = "1";
patch = "5";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "1qg0dj0zwh5ifhmvv4k771nmyqddz4ifn75s9mr1p0nyix8zks8x";
};
}

View file

@ -18,15 +18,15 @@
, kdeIntegration ? false
}:
let
primary-src = import ./still-primary-src.nix { inherit fetchurl; };
in
with { inherit (primary-src) major minor subdir version; };
let
lib = stdenv.lib;
langsSpaces = lib.concatStringsSep " " langs;
major = "5";
minor = "1";
patch = "5";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl {
inherit name md5;
@ -64,10 +64,7 @@ let
in stdenv.mkDerivation rec {
name = "libreoffice-${version}";
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "1qg0dj0zwh5ifhmvv4k771nmyqddz4ifn75s9mr1p0nyix8zks8x";
};
inherit (primary-src) src;
# we only have this problem on i686 ATM
patches = if stdenv.is64bit then null else [