diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-02 08:39:55 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-02 08:40:16 +0200 |
| commit | 2e538a0f55e3c40b2b02ee1c750f145eeb1cd27f (patch) | |
| tree | a72e85c12c6e9aa4e2221a53118a21cc341584ec /pkgs/applications/misc/yakuake | |
| parent | 9e2937ca657b71ec83ab726aeb3110dfc73be4b0 (diff) | |
| download | nixlib-2e538a0f55e3c40b2b02ee1c750f145eeb1cd27f.tar nixlib-2e538a0f55e3c40b2b02ee1c750f145eeb1cd27f.tar.gz nixlib-2e538a0f55e3c40b2b02ee1c750f145eeb1cd27f.tar.bz2 nixlib-2e538a0f55e3c40b2b02ee1c750f145eeb1cd27f.tar.lz nixlib-2e538a0f55e3c40b2b02ee1c750f145eeb1cd27f.tar.xz nixlib-2e538a0f55e3c40b2b02ee1c750f145eeb1cd27f.tar.zst nixlib-2e538a0f55e3c40b2b02ee1c750f145eeb1cd27f.zip | |
kde5.yakuake: use kdeWrapper
Diffstat (limited to 'pkgs/applications/misc/yakuake')
| -rw-r--r-- | pkgs/applications/misc/yakuake/3.0.nix | 89 |
1 files changed, 43 insertions, 46 deletions
diff --git a/pkgs/applications/misc/yakuake/3.0.nix b/pkgs/applications/misc/yakuake/3.0.nix index f3aff480914a..4ccef7f435a4 100644 --- a/pkgs/applications/misc/yakuake/3.0.nix +++ b/pkgs/applications/misc/yakuake/3.0.nix @@ -1,8 +1,9 @@ -{ stdenv +{ kdeDerivation , lib , fetchurl -, cmake -, extra-cmake-modules +, kdoctools +, kdeWrapper +, ecm , karchive , kcrash , kdbusaddons @@ -14,53 +15,49 @@ , konsole , kparts , kwindowsystem -, makeQtWrapper - }: let - pname = "yakuake"; - version = "3.0.2"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0vcdji1k8d3pz7k6lkw8ighkj94zff2l2cf9v1avf83f4hjyfhg5"; + unwrapped = let + pname = "yakuake"; + version = "3.0.2"; + in kdeDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "0vcdji1k8d3pz7k6lkw8ighkj94zff2l2cf9v1avf83f4hjyfhg5"; + }; + + buildInputs = [ + karchive + kcrash + kdbusaddons + ki18n + kiconthemes + knewstuff + knotifications + knotifyconfig + kparts + kwindowsystem + ]; + + nativeBuildInputs = [ + ecm kdoctools + ]; + + meta = { + homepage = https://yakuake.kde.org; + description = "Quad-style terminal emulator for KDE"; + maintainers = with lib.maintainers; [ fridh ]; + }; }; - buildInputs = [ - cmake - extra-cmake-modules - karchive - kcrash - kdbusaddons - ki18n - kiconthemes - knewstuff - knotifications - knotifyconfig - kparts - kwindowsystem - ]; - - nativeBuildInputs = [ - extra-cmake-modules - makeQtWrapper - ]; - - propagatedUserEnvPkgs = [ - konsole - ]; - postInstall = '' - wrapQtProgram "$out/bin/yakuake" - ''; - - meta = { - homepage = https://yakuake.kde.org; - description = "Quad-style terminal emulator for KDE"; - maintainers = with lib.maintainers; [ fridh ]; - }; +in +kdeWrapper unwrapped +{ + targets = [ "bin/yakuake" ]; + paths = [ konsole.unwrapped ]; } + |