mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

lxqt: Fix packaging errors

Browse source
This commit is contained in:
Thomas Tuegel 2017-02-25 09:44:29 -06:00
parent 4e36b374d0
commit 055c0f4405
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
18 changed files with 185 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/desktops/lxqt/base/liblxqt/default.nix
View file

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg }:
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools,
qtx11extras, qttools, qtsvg, libqtxdg, kwindowsystem, xorg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -14,15 +15,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
lxqt.lxqt-build-tools
lxqt-build-tools
];
buildInputs = [
qt5.qtx11extras
qt5.qttools
qt5.qtsvg
kde5.kwindowsystem
lxqt.libqtxdg
qtx11extras
qttools
qtsvg
kwindowsystem
libqtxdg
xorg.libXScrnSaver
];

13
pkgs/desktops/lxqt/core/libfm-qt/default.nix
View file

@ -1,5 +1,8 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg,
libfm, menu-cache }:
{
stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
xorg, libfm, menu-cache,
qtx11extras, qttools
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -16,12 +19,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkgconfig
lxqt.lxqt-build-tools
lxqt-build-tools
];
buildInputs = [
qt5.qtx11extras
qt5.qttools
qtx11extras
qttools
libfm
menu-cache
];

18
pkgs/desktops/lxqt/core/lxqt-about/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -14,21 +14,21 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
lxqt.lxqt-build-tools
lxqt-build-tools
];
buildInputs = [
qt5.qtx11extras
qt5.qttools
qt5.qtsvg
kde5.kwindowsystem
lxqt.liblxqt
lxqt.libqtxdg
qtx11extras
qttools
qtsvg
kwindowsystem
liblxqt
libqtxdg
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = lxqt.standardPatch;
postPatch = standardPatch;
meta = with stdenv.lib; {
description = "Dialogue window providing information about LXQt and the system it's running on";

18
pkgs/desktops/lxqt/core/lxqt-admin/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, polkit }:
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -14,22 +14,22 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
lxqt.lxqt-build-tools
lxqt-build-tools
];
buildInputs = [
qt5.qtx11extras
qt5.qttools
qt5.qtsvg
kde5.kwindowsystem
lxqt.liblxqt
lxqt.libqtxdg
qtx11extras
qttools
qtsvg
kwindowsystem
liblxqt
libqtxdg
polkit
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = lxqt.standardPatch;
postPatch = standardPatch;
meta = with stdenv.lib; {
description = "LXQt system administration tool";

22
pkgs/desktops/lxqt/core/lxqt-config/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg }:
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -15,18 +15,18 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkgconfig
lxqt.lxqt-build-tools
lxqt-build-tools
];
buildInputs = [
qt5.qtbase
qt5.qtx11extras
qt5.qttools
qt5.qtsvg
kde5.kwindowsystem
kde5.libkscreen
lxqt.liblxqt
lxqt.libqtxdg
qtbase
qtx11extras
qttools
qtsvg
kwindowsystem
libkscreen
liblxqt
libqtxdg
xorg.libpthreadstubs
xorg.libXdmcp
xorg.libXScrnSaver
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = lxqt.standardPatch;
postPatch = standardPatch;
meta = with stdenv.lib; {
description = "Tools to configure LXQt and the underlying operating system";

20
pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -14,22 +14,22 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
lxqt.lxqt-build-tools
lxqt-build-tools
];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtx11extras
qt5.qtsvg
kde5.kwindowsystem
lxqt.liblxqt
lxqt.libqtxdg
qtbase
qttools
qtx11extras
qtsvg
kwindowsystem
liblxqt
libqtxdg
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = lxqt.standardPatch;
postPatch = standardPatch;
meta = with stdenv.lib; {
description = "Daemon used to register global keyboard shortcuts";

18
pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -14,17 +14,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
lxqt.lxqt-build-tools
lxqt-build-tools
];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtsvg
kde5.kwindowsystem
lxqt.liblxqt
lxqt.libqtxdg
lxqt.lxqt-common
qtbase
qttools
qtsvg
kwindowsystem
liblxqt
libqtxdg
lxqt-common
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];

18
pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -14,17 +14,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
lxqt.lxqt-build-tools
lxqt-build-tools
];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtx11extras
qt5.qtsvg
kde5.kwindowsystem
lxqt.liblxqt
lxqt.libqtxdg
qtbase
qttools
qtx11extras
qtsvg
kwindowsystem
liblxqt
libqtxdg
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];

41
pkgs/desktops/lxqt/core/lxqt-panel/default.nix
View file

@ -1,6 +1,11 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg,
libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache,
lxmenu-data }:
{
stdenv, fetchFromGitHub, standardPatch,
cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat,
xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache,
lxmenu-data
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -17,23 +22,23 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkgconfig
lxqt.lxqt-build-tools
lxqt-build-tools
];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtx11extras
qt5.qtsvg
qt5.libdbusmenu
kde5.kwindowsystem
kde5.solid
kde5.kguiaddons
lxqt.liblxqt
lxqt.libqtxdg
lxqt.lxqt-common
lxqt.lxqt-globalkeys
lxqt.libsysstat
qtbase
qttools
qtx11extras
qtsvg
libdbusmenu
kwindowsystem
solid
kguiaddons
liblxqt
libqtxdg
lxqt-common
lxqt-globalkeys
libsysstat
xorg.libpthreadstubs
xorg.libXdmcp
libstatgrab
@ -46,7 +51,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = lxqt.standardPatch;
postPatch = standardPatch;
meta = with stdenv.lib; {
description = "The LXQt desktop panel";

24
pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
View file

@ -1,4 +1,8 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt }:
{
stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt,
libqtxdg,
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -15,18 +19,18 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkgconfig
lxqt.lxqt-build-tools
lxqt-build-tools
];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtx11extras
qt5.qtsvg
qt5.polkit-qt
kde5.kwindowsystem
lxqt.liblxqt
lxqt.libqtxdg
qtbase
qttools
qtx11extras
qtsvg
polkit-qt
kwindowsystem
liblxqt
libqtxdg
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];

22
pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -14,19 +14,19 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
lxqt.lxqt-build-tools
lxqt-build-tools
];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtx11extras
qt5.qtsvg
kde5.kwindowsystem
kde5.solid
kde5.kidletime
lxqt.liblxqt
lxqt.libqtxdg
qtbase
qttools
qtx11extras
qtsvg
kwindowsystem
solid
kidletime
liblxqt
libqtxdg
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];

22
pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
View file

@ -1,4 +1,8 @@
{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
{
stdenv, fetchFromGitHub, standardPatch,
cmake, lxqt-build-tools,
qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg,
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -14,21 +18,21 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
lxqt.lxqt-build-tools
lxqt-build-tools
];
buildInputs = [
qt5.qtbase
qt5.qtx11extras
qt5.qttools
qt5.qtsvg
qt5.libdbusmenu
lxqt.libqtxdg
qtbase
qtx11extras
qttools
qtsvg
libdbusmenu
libqtxdg
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = lxqt.standardPatch;
postPatch = standardPatch;
meta = with stdenv.lib; {
description = "LXQt Qt platform integration plugin";

20
pkgs/desktops/lxqt/core/lxqt-runner/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt,
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys,
menu-cache, muparser }:
stdenv.mkDerivation rec {
@ -16,18 +16,18 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkgconfig
lxqt.lxqt-build-tools
lxqt-build-tools
];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtsvg
kde5.kwindowsystem
lxqt.liblxqt
lxqt.libqtxdg
lxqt.lxqt-common
lxqt.lxqt-globalkeys
qtbase
qttools
qtsvg
kwindowsystem
liblxqt
libqtxdg
lxqt-common
lxqt-globalkeys
menu-cache
muparser
];

18
pkgs/desktops/lxqt/core/lxqt-session/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, xdg-user-dirs }:
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, xorg, xdg-user-dirs }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -15,17 +15,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkgconfig
lxqt.lxqt-build-tools
lxqt-build-tools
];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtsvg
kde5.kwindowsystem
lxqt.liblxqt
lxqt.libqtxdg
lxqt.lxqt-common
qtbase
qttools
qtsvg
kwindowsystem
liblxqt
libqtxdg
lxqt-common
xorg.libpthreadstubs
xorg.libXdmcp
xdg-user-dirs

18
pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, sudo }:
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -14,17 +14,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
lxqt.lxqt-build-tools
lxqt-build-tools
];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtx11extras
qt5.qtsvg
kde5.kwindowsystem
lxqt.liblxqt
lxqt.libqtxdg
qtbase
qttools
qtx11extras
qtsvg
kwindowsystem
liblxqt
libqtxdg
sudo
];

22
pkgs/desktops/lxqt/default.nix
View file

@ -1,9 +1,7 @@
{ pkgs, newScope, fetchFromGitHub }:
{ pkgs, makeScope, libsForQt5, fetchFromGitHub }:
let
callPackage = newScope self;
self = rec {
packages = self: with self; {
# For compiling information, see:
# - https://github.com/lxde/lxqt/wiki/Building-from-source
@ -37,7 +35,9 @@ let
lxqt-about = callPackage ./core/lxqt-about { };
lxqt-admin = callPackage ./core/lxqt-admin { };
lxqt-common = callPackage ./core/lxqt-common { };
lxqt-config = callPackage ./core/lxqt-config { };
lxqt-config = callPackage ./core/lxqt-config {
inherit (pkgs.plasma5) libkscreen;
};
lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { };
lxqt-l10n = callPackage ./core/lxqt-l10n { };
lxqt-notificationd = callPackage ./core/lxqt-notificationd { };
@ -57,7 +57,7 @@ let
### OPTIONAL
qterminal = callPackage ./optional/qterminal { };
compton-conf = callPackage ./optional/compton-conf { };
compton-conf = pkgs.qt5.callPackage ./optional/compton-conf { };
obconf-qt = callPackage ./optional/obconf-qt { };
lximage-qt = callPackage ./optional/lximage-qt { };
qps = callPackage ./optional/qps { };
@ -66,14 +66,14 @@ let
preRequisitePackages = [
pkgs.gvfs # virtual file systems support for PCManFM-QT
pkgs.kde5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
pkgs.kde5.libkscreen # provides plugins for screen management software
pkgs.libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
pkgs.plasma5.libkscreen # provides plugins for screen management software
pkgs.libfm
pkgs.libfm-extra
pkgs.lxmenu-data
pkgs.menu-cache
pkgs.openbox # default window manager
pkgs.qt5.qtsvg # provides QT5 plugins for svg icons
qt5.qtsvg # provides QT5 plugins for svg icons
];
corePackages = [
@ -120,7 +120,7 @@ let
qlipper
### Default icon theme
pkgs.kde5.oxygen-icons5
qt5.oxygen-icons5
### Screen saver
pkgs.xscreensaver
@ -128,4 +128,4 @@ let
};
in self
in makeScope libsForQt5.newScope packages

6
pkgs/desktops/lxqt/optional/compton-conf/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, libconfig }:
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt, libconfig }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
qt5.qtbase
qt5.qttools
qtbase
qttools
libconfig
];

14
pkgs/desktops/lxqt/optional/screengrab/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg }:
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg }:
stdenv.mkDerivation rec {
name = "screengrab-unstable-2017-02-18";
@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtx11extras
qt5.qtsvg
kde5.kwindowsystem
lxqt.libqtxdg
qtbase
qttools
qtx11extras
qtsvg
kwindowsystem
libqtxdg
xorg.libpthreadstubs
xorg.libXdmcp
];