public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #73848 from mmilata/libreoffice-headers

Browse Source 
libreoffice: add dev output with headers
This commit is contained in:
Michael Raskin 2019-11-21 13:27:32 +00:00 committed by GitHub
commit 403b208462
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/office/libreoffice/default.nix
View File

@ -65,6 +65,8 @@ in stdenv.mkDerivation rec {
inherit (primary-src) src; inherit (primary-src) src;
outputs = [ "out" "dev" ];
# For some reason librdf_redland sometimes refers to rasqal.h instead # For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h # of rasqal/rasqal.h
NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma"; 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" cp -r sysui/desktop/icons "$out/share"
sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
mkdir -p $dev
cp -r include $dev
''; '';
configureFlags = [ configureFlags = [

5
pkgs/applications/office/libreoffice/still.nix
View File

@ -65,6 +65,8 @@ in stdenv.mkDerivation rec {
inherit (primary-src) src; inherit (primary-src) src;
outputs = [ "out" "dev" ];
# For some reason librdf_redland sometimes refers to rasqal.h instead # For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h # of rasqal/rasqal.h
NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ]; NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ];
@ -276,6 +278,9 @@ in stdenv.mkDerivation rec {
cp -r sysui/desktop/icons "$out/share" cp -r sysui/desktop/icons "$out/share"
sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
mkdir -p $dev
cp -r include $dev
''; '';
configureFlags = [ configureFlags = [