From 9ac568fc929ac85dd0449dd7345fe4947df44bf5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 29 Jul 2016 12:44:09 -0500 Subject: [PATCH] breeze-qt4: avoid accidental Qt 5 dependency --- pkgs/desktops/kde-5/plasma/breeze-qt4.nix | 39 ++++++++++------------- pkgs/desktops/kde-5/plasma/default.nix | 4 ++- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/breeze-qt4.nix b/pkgs/desktops/kde-5/plasma/breeze-qt4.nix index f8092bc9d376..ad98a41e81dd 100644 --- a/pkgs/desktops/kde-5/plasma/breeze-qt4.nix +++ b/pkgs/desktops/kde-5/plasma/breeze-qt4.nix @@ -1,27 +1,22 @@ -{ plasmaPackage -, automoc4 -, cmake -, perl -, pkgconfig -, kdelibs -, qt4 -, xproto +{ + stdenv, lib, src, version, + automoc4, cmake, perl, pkgconfig, + kdelibs, qt4, xproto }: -plasmaPackage { - name = "breeze-qt4"; - sname = "breeze"; - buildInputs = [ - kdelibs - qt4 - xproto - ]; - nativeBuildInputs = [ - automoc4 - cmake - perl - pkgconfig - ]; +stdenv.mkDerivation { + name = "breeze-qt4-${version}"; + meta = { + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ttuegel ]; + homepage = "http://www.kde.org"; + }; + inherit src; + buildInputs = [ kdelibs qt4 xproto ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; cmakeFlags = [ "-DUSE_KDE4=ON" "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake" diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix index 2299e9fbc2aa..7aff229b4c12 100644 --- a/pkgs/desktops/kde-5/plasma/default.nix +++ b/pkgs/desktops/kde-5/plasma/default.nix @@ -40,7 +40,9 @@ let bluedevil = callPackage ./bluedevil.nix {}; breeze-gtk = callPackage ./breeze-gtk.nix {}; - breeze-qt4 = callPackage ./breeze-qt4.nix {}; + breeze-qt4 = callPackage ./breeze-qt4.nix { + inherit (srcs.breeze) src version; + }; breeze-qt5 = callPackage ./breeze-qt5.nix {}; breeze = let