diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-05 00:02:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-05 00:02:47 +0000 |
| commit | 1a5c2acd74f16ddd16faa1f2ebc0bf6b0c7614c8 (patch) | |
| tree | c0f2cb1aecad3b779e50e6a1f711b7ca6fc3c474 /pkgs/applications/office | |
| parent | 31c9deb4f72b5cf63af4f60a700816e2c293ce8d (diff) | |
| parent | 77a8486bb356bc6a6f19637164dedff0fa9136d9 (diff) | |
| download | nixpkgs-1a5c2acd74f16ddd16faa1f2ebc0bf6b0c7614c8.tar nixpkgs-1a5c2acd74f16ddd16faa1f2ebc0bf6b0c7614c8.tar.gz nixpkgs-1a5c2acd74f16ddd16faa1f2ebc0bf6b0c7614c8.tar.bz2 nixpkgs-1a5c2acd74f16ddd16faa1f2ebc0bf6b0c7614c8.tar.lz nixpkgs-1a5c2acd74f16ddd16faa1f2ebc0bf6b0c7614c8.tar.xz nixpkgs-1a5c2acd74f16ddd16faa1f2ebc0bf6b0c7614c8.tar.zst nixpkgs-1a5c2acd74f16ddd16faa1f2ebc0bf6b0c7614c8.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/scribus/1_4.nix | 52 | ||||
| -rw-r--r-- | pkgs/applications/office/tagainijisho/default.nix | 9 |
2 files changed, 5 insertions, 56 deletions
diff --git a/pkgs/applications/office/scribus/1_4.nix b/pkgs/applications/office/scribus/1_4.nix deleted file mode 100644 index a6427d0f890..00000000000 --- a/pkgs/applications/office/scribus/1_4.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2 -, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg -, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }: - -let - icon = fetchurl { - url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg"; - sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3"; - }; - - pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); -in stdenv.mkDerivation rec { - pname = "scribus"; - version = "1.4.8"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992"; - }; - - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = with xorg; - [ freetype lcms libtiff libxml2 libart_lgpl qt4 - pythonEnv cups fontconfig - libjpeg zlib libpng podofo hunspell cairo - boost # for internal 2geom library - libXaw libXext libX11 libXtst libXi libXinerama - libpthreadstubs libXau libXdmcp - imagemagick # To build the icon - ]; - - postPatch = '' - substituteInPlace scribus/util_ghostscript.cpp \ - --replace 'QString gsName("gs");' \ - 'QString gsName("${ghostscript}/bin/gs");' - ''; - - postInstall = '' - for i in 16 24 48 64 96 128 256 512; do - mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps - convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png - done - ''; - - meta = { - maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.linux; - description = "Desktop Publishing (DTP) and Layout program for Linux"; - homepage = "https://www.scribus.net"; - license = lib.licenses.gpl2; - }; -} diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 7e171f7d702..55c84fd2a3d 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,5 +1,6 @@ -{ lib, mkDerivation, fetchzip, qtbase, qttools, cmake, sqlite }: -mkDerivation rec { +{ stdenv, lib, fetchzip, qtbase, qttools, cmake, sqlite, wrapQtAppsHook }: + +stdenv.mkDerivation rec { pname = "tagainijisho"; version = "1.2.2"; @@ -8,8 +9,8 @@ mkDerivation rec { hash = "sha256-CTDMoYGbVE4W0SDerW//aAdUVsySWFQycSy0I3a9+94="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase qttools sqlite ]; + nativeBuildInputs = [ qttools cmake wrapQtAppsHook ]; + buildInputs = [ qtbase sqlite ]; cmakeFlags = [ "-DEMBED_SQLITE=OFF" |