public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mkLibsForQt5: remove kdeFrameworks attribute

This commit is contained in:
Thomas Tuegel 2017-02-25 13:44:57 -06:00
parent 7f84ad5f4c
commit e39a4597ce
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/kde-frameworks/default.nix
View File

@ -24,16 +24,18 @@ existing packages here and modify it as necessary.
*/ */
{ pkgs, debug ? false }: {
stdenv, lib, makeSetupHook, makeWrapper, fetchurl, buildEnv,
callPackage,
debug ? false
}:
let let
inherit (pkgs) lib makeSetupHook stdenv;
mirror = "mirror://kde"; mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; srcs = import ./srcs.nix { inherit fetchurl mirror; };
packages = self: with self; { packages = rec {
kdeDerivation = args: kdeDerivation = args:
let let
@ -69,7 +71,7 @@ let
}); });
kdeWrapper = import ./kde-wrapper.nix { kdeWrapper = import ./kde-wrapper.nix {
inherit (pkgs) stdenv lib makeWrapper buildEnv; inherit stdenv lib makeWrapper buildEnv;
}; };
attica = callPackage ./attica.nix {}; attica = callPackage ./attica.nix {};

8
pkgs/top-level/all-packages.nix
View File

@ -9336,12 +9336,12 @@ with pkgs;
qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };
mkLibsForQt5 = self: with self; mkLibsForQt5 = self: with self;
let kdeFrameworks = let kdeFrameworks = import ../development/libraries/kde-frameworks {
import ../development/libraries/kde-frameworks { inherit pkgs; } self; inherit stdenv lib makeSetupHook makeWrapper fetchurl buildEnv;
inherit (self) callPackage;
};
in { in {
inherit kdeFrameworks;
accounts-qt = callPackage ../development/libraries/accounts-qt { }; accounts-qt = callPackage ../development/libraries/accounts-qt { };
fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };