diff --git a/pkgs/applications/kde-apps-15.08/default.nix b/pkgs/applications/kde-apps-15.08/default.nix index d374f2b12875..914b0c8e4aa4 100644 --- a/pkgs/applications/kde-apps-15.08/default.nix +++ b/pkgs/applications/kde-apps-15.08/default.nix @@ -21,25 +21,10 @@ let srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; mirror = "mirror://kde"; - kdeApp = args: - let - inherit (args) name; - sname = args.sname or name; - inherit (srcs."${sname}") src version; - in stdenv.mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - - meta = { - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - } // (args.meta or {}); - }); + kdeApp = import ./kde-app.nix { + inherit stdenv lib; + inherit debug srcs; + }; kdeLocale4 = name: args: { kdeApp, automoc4, cmake, gettext, kdelibs, perl }: diff --git a/pkgs/applications/kde-apps-15.08/kde-app.nix b/pkgs/applications/kde-apps-15.08/kde-app.nix new file mode 100644 index 000000000000..242f3d9c793d --- /dev/null +++ b/pkgs/applications/kde-apps-15.08/kde-app.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, debug, srcs }: + +args: + +let + inherit (args) name; + sname = args.sname or name; + inherit (srcs."${sname}") src version; +in +stdenv.mkDerivation (args // { + name = "${name}-${version}"; + inherit src; + + cmakeFlags = + (args.cmakeFlags or []) + ++ [ "-DBUILD_TESTING=OFF" ] + ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + + meta = { + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + } // (args.meta or {}); +})