diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-09-18 09:28:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-18 09:28:38 -0500 |
| commit | 8d3644d7b2ae8f0911e3cfac759a1c14f74621cb (patch) | |
| tree | 88a462232d5a953e200699afdbeb0918b35e34c7 /pkgs/desktops | |
| parent | 634824d50be0fbccd30359366db8a150eb25dabd (diff) | |
| parent | bbd82656bba0ac9b104a00671284daf36e62234f (diff) | |
| download | nixlib-8d3644d7b2ae8f0911e3cfac759a1c14f74621cb.tar nixlib-8d3644d7b2ae8f0911e3cfac759a1c14f74621cb.tar.gz nixlib-8d3644d7b2ae8f0911e3cfac759a1c14f74621cb.tar.bz2 nixlib-8d3644d7b2ae8f0911e3cfac759a1c14f74621cb.tar.lz nixlib-8d3644d7b2ae8f0911e3cfac759a1c14f74621cb.tar.xz nixlib-8d3644d7b2ae8f0911e3cfac759a1c14f74621cb.tar.zst nixlib-8d3644d7b2ae8f0911e3cfac759a1c14f74621cb.zip | |
Merge pull request #18303 from the-kenny/digikam-51
Digikam 5.1
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-5/applications/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/desktops/kde-5/applications/marble.nix | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix index 3166b94adaa7..980cc9ac25c8 100644 --- a/pkgs/desktops/kde-5/applications/default.nix +++ b/pkgs/desktops/kde-5/applications/default.nix @@ -57,6 +57,7 @@ let libkexiv2 = callPackage ./libkexiv2.nix {}; libkipi = callPackage ./libkipi.nix {}; libkomparediff2 = callPackage ./libkomparediff2.nix {}; + marble = callPackage ./marble.nix {}; okular = callPackage ./okular.nix {}; print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; diff --git a/pkgs/desktops/kde-5/applications/marble.nix b/pkgs/desktops/kde-5/applications/marble.nix new file mode 100644 index 000000000000..8d6ee5a0f7c5 --- /dev/null +++ b/pkgs/desktops/kde-5/applications/marble.nix @@ -0,0 +1,24 @@ +{ kdeApp, lib, kdeWrapper +, ecm, qtscript, qtsvg, qtquickcontrols +, gpsd +}: + +let + unwrapped = + kdeApp { + name = "marble"; + meta.license = with lib.licenses; [ lgpl21 gpl3 ]; + + nativeBuildInputs = [ ecm ]; + propagatedBuildInputs = [ + qtscript qtsvg qtquickcontrols + gpsd + ]; + + enableParallelBuilding = true; + }; +in +kdeWrapper unwrapped { + targets = [ "bin/marble-qt" ]; + paths = [ unwrapped ]; +} |