diff options
-rw-r--r-- | pkgs/desktops/kde-5/applications/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/kde-5/applications/okular.nix | 46 |
2 files changed, 17 insertions, 33 deletions
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix index b95201ab31f0..329fca9c8498 100644 --- a/pkgs/desktops/kde-5/applications/default.nix +++ b/pkgs/desktops/kde-5/applications/default.nix @@ -54,7 +54,9 @@ let libkexiv2 = callPackage ./libkexiv2.nix {}; libkipi = callPackage ./libkipi.nix {}; libkomparediff2 = callPackage ./libkomparediff2.nix {}; - okular = callPackage ./okular.nix {}; + okular = callPackage ./okular.nix { + inherit (srcs.okular) src version; + }; print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; diff --git a/pkgs/desktops/kde-5/applications/okular.nix b/pkgs/desktops/kde-5/applications/okular.nix index 0691325d7a52..5a21c18b88ac 100644 --- a/pkgs/desktops/kde-5/applications/okular.nix +++ b/pkgs/desktops/kde-5/applications/okular.nix @@ -1,40 +1,22 @@ -{ kdeApp -, lib -, automoc4 -, cmake -, perl -, pkgconfig -, kdelibs -, qimageblitz -, poppler_qt4 -, libspectre -, libkexiv2 -, djvulibre -, libtiff -, freetype -, ebook_tools +{ + stdenv, lib, + src, version, + automoc4, cmake, perl, pkgconfig, kdelibs, qimageblitz, + poppler_qt4, libspectre, libkexiv2, djvulibre, libtiff, freetype, + ebook_tools }: -kdeApp { - name = "okular"; - nativeBuildInputs = [ - automoc4 - cmake - perl - pkgconfig - ]; +stdenv.mkDerivation { + name = "okular-${version}"; + inherit src; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; buildInputs = [ - kdelibs - qimageblitz - poppler_qt4 - libspectre - libkexiv2 - djvulibre - libtiff - freetype - ebook_tools + kdelibs qimageblitz poppler_qt4 libspectre libkexiv2 djvulibre libtiff + freetype ebook_tools ]; meta = { + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; }; |