diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2019-11-21 13:27:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-21 13:27:32 +0000 |
| commit | 403b208462543880e1e1c1b1d1d50c924f164f3d (patch) | |
| tree | 8dac9c3f2831640a2efd69bf39b048ceb1161ab4 /pkgs | |
| parent | 689900ccf3e7cb99f11d5c907e7a9edbc294812e (diff) | |
| parent | 879c47c82a26304bd7f4e9cbe87a6df0ddd0a910 (diff) | |
| download | nixpkgs-403b208462543880e1e1c1b1d1d50c924f164f3d.tar nixpkgs-403b208462543880e1e1c1b1d1d50c924f164f3d.tar.gz nixpkgs-403b208462543880e1e1c1b1d1d50c924f164f3d.tar.bz2 nixpkgs-403b208462543880e1e1c1b1d1d50c924f164f3d.tar.lz nixpkgs-403b208462543880e1e1c1b1d1d50c924f164f3d.tar.xz nixpkgs-403b208462543880e1e1c1b1d1d50c924f164f3d.tar.zst nixpkgs-403b208462543880e1e1c1b1d1d50c924f164f3d.zip | |
Merge pull request #73848 from mmilata/libreoffice-headers
libreoffice: add dev output with headers
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/office/libreoffice/still.nix | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 2f220fa2fb6..51ef4eb9d24 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -65,6 +65,8 @@ in stdenv.mkDerivation rec { inherit (primary-src) src; + outputs = [ "out" "dev" ]; + # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma"; @@ -276,6 +278,9 @@ in stdenv.mkDerivation rec { cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop + + mkdir -p $dev + cp -r include $dev ''; configureFlags = [ diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index be87a8bb672..fc984d39e27 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -65,6 +65,8 @@ in stdenv.mkDerivation rec { inherit (primary-src) src; + outputs = [ "out" "dev" ]; + # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ]; @@ -276,6 +278,9 @@ in stdenv.mkDerivation rec { cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop + + mkdir -p $dev + cp -r include $dev ''; configureFlags = [ |