diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-24 10:13:31 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-24 10:13:31 +0100 |
| commit | 1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f (patch) | |
| tree | 313bc0caa017c3e41a961bf63c7b70aac8bc6334 /pkgs/applications/office/libreoffice | |
| parent | 525c54c7ef4ac6bc86e1a9f84cff72af43884d2a (diff) | |
| parent | ab0a828662c4c6a8535b630081a67c20286099ab (diff) | |
| download | nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.gz nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.bz2 nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.lz nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.xz nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.tar.zst nixpkgs-1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/office/libreoffice')
| -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 506f33a2d0e..42f75560a5a 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 12e49fa48fe..c42820e6114 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 = [ |