diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-25 13:44:57 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-27 11:49:13 -0600 |
| commit | e39a4597ce3eb209b1d3672cc0433785df93db88 (patch) | |
| tree | a78ca0732c333f258e21313bc1a7e3023d6e365f /pkgs | |
| parent | 7f84ad5f4c4a2aac98ebb2f4a37a02915e357939 (diff) | |
| download | nixlib-e39a4597ce3eb209b1d3672cc0433785df93db88.tar nixlib-e39a4597ce3eb209b1d3672cc0433785df93db88.tar.gz nixlib-e39a4597ce3eb209b1d3672cc0433785df93db88.tar.bz2 nixlib-e39a4597ce3eb209b1d3672cc0433785df93db88.tar.lz nixlib-e39a4597ce3eb209b1d3672cc0433785df93db88.tar.xz nixlib-e39a4597ce3eb209b1d3672cc0433785df93db88.tar.zst nixlib-e39a4597ce3eb209b1d3672cc0433785df93db88.zip | |
mkLibsForQt5: remove kdeFrameworks attribute
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index a4e64aaee41e..cb73bbddda7e 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -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 - inherit (pkgs) lib makeSetupHook stdenv; - 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: let @@ -69,7 +71,7 @@ let }); kdeWrapper = import ./kde-wrapper.nix { - inherit (pkgs) stdenv lib makeWrapper buildEnv; + inherit stdenv lib makeWrapper buildEnv; }; attica = callPackage ./attica.nix {}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76bca8050525..bb9f348e87ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9336,12 +9336,12 @@ with pkgs; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; mkLibsForQt5 = self: with self; - let kdeFrameworks = - import ../development/libraries/kde-frameworks { inherit pkgs; } self; + let kdeFrameworks = import ../development/libraries/kde-frameworks { + inherit stdenv lib makeSetupHook makeWrapper fetchurl buildEnv; + inherit (self) callPackage; + }; in { - inherit kdeFrameworks; - accounts-qt = callPackage ../development/libraries/accounts-qt { }; fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; |