Merge pull request #31115 from romildo/upd.lxqt

lxqt: 0.11.1 -> 0.12.0
This commit is contained in:
Robin Gloster 2017-11-02 14:31:03 +01:00 committed by GitHub
commit 0807f4ac66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 251 additions and 220 deletions

View file

@ -41,7 +41,7 @@ in
name = "lxqt"; name = "lxqt";
bgSupport = true; bgSupport = true;
start = '' start = ''
exec ${pkgs.lxqt.lxqt-common}/bin/startlxqt exec ${pkgs.lxqt.lxqt-session}/bin/startlxqt
''; '';
}; };

View file

@ -19,8 +19,9 @@ mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
qtbase qtmultimedia qtsvg lxqt.qtermwidget # virt-manager-qt currently does not compile with qtermwidget-0.8.0
libvirt libvncserver pcre pixman spice_gtk spice_protocol qtbase qtmultimedia qtsvg lxqt.qtermwidget_0_7_1
libvirt libvncserver pixman spice_gtk spice_protocol
]; ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "liblxqt"; pname = "liblxqt";
version = "0.11.1"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0dcsgj0qr4589wsibs6fdza4ncqavrhykd05d25rs78pa94lvvh5"; sha256 = "1852vfbkbpw49i8ad682jhqmnskmc9a90qwpalipgak7m64azg3j";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,24 +2,28 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libqtxdg-${version}"; name = "libqtxdg-${version}";
version = "2.0.0"; version = "3.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = "libqtxdg"; repo = "libqtxdg";
rev = version; rev = version;
sha256 = "1s5jw4q6gcivk7mc95ir9q2nry4yyhfwy039ddf5ymh79nynv8vy"; sha256 = "03kdrx5sgrl93yband87n30i0k2mv6dknwdw2adz45j5z9rhd3z6";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ qt5.qtbase qt5.qtsvg ]; buildInputs = [ qt5.qtbase qt5.qtsvg ];
preConfigure = ''
cmakeFlags+=" -DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Qt implementation of freedesktop.org xdg specs"; description = "Qt implementation of freedesktop.org xdg specs";
homepage = https://github.com/lxde/libqtxdg; homepage = https://github.com/lxde/libqtxdg;
license = licenses.lgpl21; license = licenses.lgpl21;
maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix; platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
}; };
} }

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libsysstat-${version}"; name = "libsysstat-${version}";
version = "0.3.3"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = "libsysstat"; repo = "libsysstat";
rev = version; rev = version;
sha256 = "1rkbh6jj69wsf8a7w7cq8psqw08vqf9rq5pdnv4xxqb036r4bi31"; sha256 = "0yl20dj553z1ijkfxl9n45qvkzxyl9rqw12vb4v6zj3ch6hzbzsx";
}; };
nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ]; nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ];

View file

@ -1,17 +1,19 @@
{ stdenv, fetchFromGitHub, cmake, qt5 }: { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lxqt-build-tools-${version}"; name = "lxqt-build-tools-${version}";
version = "0.3.2"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = "lxqt-build-tools"; repo = "lxqt-build-tools";
rev = version; rev = version;
sha256 = "1awd70ifbbi67pklhldjw968c1fw1lcif9nh4qbrjqmlg1gn3kmv"; sha256 = "0i3pzgyd80n73dnqs8f6axinaji7biflgqsi33baxn4r1hy58ym1";
}; };
nativeBuildInputs = [ cmake qt5.qtbase ]; nativeBuildInputs = [ cmake pkgconfig pcre qt5.qtbase ];
preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Various packaging tools and scripts for LXQt applications"; description = "Various packaging tools and scripts for LXQt applications";

View file

@ -1,19 +1,19 @@
{ {
stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
xorg, libfm, menu-cache, pcre, libexif, xorg, libfm, menu-cache,
qtx11extras, qttools qtx11extras, qttools
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "libfm-qt"; pname = "libfm-qt";
version = "0.11.2"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0k2g6bkz7bvawqkjzykbxi18wqsnhbxklqy6aqqkclpzcw45vk5v"; sha256 = "0932yl098pc5rwgy9irrc3ys47jx64m3wm702dvs8yy15alv6x4i";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
pcre
libexif
xorg.libpthreadstubs
xorg.libxcb
xorg.libXdmcp
qtx11extras qtx11extras
qttools qttools
libfm libfm

View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-about"; pname = "lxqt-about";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1pa68pr0iwvh34lippagc8kxdfd0l2071m0vh7dnvfqbnwly29dk"; sha256 = "13knjxbnq0mh9jgkllarf6rjxkvj2c93l0srnlrqp3939gcpwxh3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = standardPatch;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Dialogue window providing information about LXQt and the system it's running on"; description = "Dialogue window providing information about LXQt and the system it's running on";
homepage = https://github.com/lxde/lxqt-about; homepage = https://github.com/lxde/lxqt-about;

View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-admin"; pname = "lxqt-admin";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "12c1wdciqgiifsk5aslw3990pk9ylk9jhgwnrxvh798rr48hhflr"; sha256 = "0dg3gm5m19dc4jarh8xcn0mcnpgxzz7nhy5dzm8chddaa6pdm7vi";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -29,8 +29,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = standardPatch;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "LXQt system administration tool"; description = "LXQt system administration tool";
homepage = https://github.com/lxde/lxqt-admin; homepage = https://github.com/lxde/lxqt-admin;

View file

@ -1,40 +0,0 @@
{ stdenv, fetchFromGitHub, cmake, qt5, lxqt, hicolor_icon_theme, xmessage }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-common";
version = "0.11.2";
src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
sha256 = "07ih2w9ksbxqwy36xvgb9b31740nhkm7ap70wvv8q6x0wyhn71gn";
};
nativeBuildInputs = [
cmake
lxqt.lxqt-build-tools
];
buildInputs = [
qt5.qtsvg
hicolor_icon_theme
xmessage
];
postPatch = lxqt.standardPatch
+ ''
substituteInPlace ./startlxqt.in \
--replace "cp " "cp --no-preserve=mode " \
--replace xmessage "${xmessage}"/bin/xmessage
'';
meta = with stdenv.lib; {
description = "Common files for LXQt";
homepage = https://github.com/lxde/lxqt-common;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
};
}

View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }: { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-config"; pname = "lxqt-config";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0mqvv93djsw49n0gxpws3hrwimnyf9kzvc2vhjkzrjfxpabk2axx"; sha256 = "1ccxkdfhgf40jxiy0132yr9b28skvs9yr8j75w663hnqi6ccn377";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -36,7 +36,10 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = standardPatch; postPatch = ''
substituteInPlace src/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tools to configure LXQt and the underlying operating system"; description = "Tools to configure LXQt and the underlying operating system";
@ -46,12 +49,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ romildo ]; maintainers = with maintainers; [ romildo ];
}; };
patches = [
# Fixes a FTBFS with CMake v3.8
(fetchpatch {
url = https://github.com/lxde/lxqt-config/commit/bca652a75f8a497a69b1fbc1c7eaa353f6b4eef8.patch;
sha256 = "17k26xj97ks9gvcjhiwc5y39fciria4xyxrzcz67zj0flqm3cmrf";
})
];
} }

View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-globalkeys"; pname = "lxqt-globalkeys";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1kwibll2azi4pafk7crfgibk5a54rnsia3c4cz680iny7xz1wy6h"; sha256 = "14icyik9x47wi3gfkmkyhag26a2ivyc42f4f8qwdgbr3dcg10b9a";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -29,7 +29,12 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = standardPatch; postPatch = ''
for dir in autostart xdg; do
substituteInPlace $dir/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
done
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Daemon used to register global keyboard shortcuts"; description = "Daemon used to register global keyboard shortcuts";

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lxqt-l10n-${version}"; name = "lxqt-l10n-${version}";
version = "0.11.2"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = "lxqt-l10n"; repo = "lxqt-l10n";
rev = version; rev = version;
sha256 = "1vk4q98kraq0lba50n9z6jwiapc7nz2b143b4ldlmrz4wscd867h"; sha256 = "025zg5y9f286p74rab4yxyz4cqlh4hqjq43xxpi76ma2fy2s03a4";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, qtx11extras }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-notificationd"; pname = "lxqt-notificationd";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1n39zjczzhqn73vfyjngybmk9w8j1z3vjkaq80rf2hk89vwsm0wc"; sha256 = "0pmpdqgnb2dfxw5lirh89j8hnrwwcn2zc64byg4zi0xdvq6qms43";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
lxqt-build-tools lxqt-build-tools
]; ];
postPatch = ''
substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
'';
buildInputs = [ buildInputs = [
qtbase qtbase
qttools qttools
@ -24,7 +29,6 @@ stdenv.mkDerivation rec {
kwindowsystem kwindowsystem
liblxqt liblxqt
libqtxdg libqtxdg
lxqt-common
qtx11extras qtx11extras
]; ];

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-openssh-askpass"; pname = "lxqt-openssh-askpass";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "030pzys86s7rpgl35kl4b3y7gmv9982j3blmg8927nq4pw61gfj9"; sha256 = "16xcw4yll6i9vij16kdb10s4aq2s57x4yjlwv6d8r75y5gq9iiw6";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,22 +1,22 @@
{ {
stdenv, fetchFromGitHub, fetchpatch, standardPatch, stdenv, fetchFromGitHub,
cmake, pkgconfig, lxqt-build-tools, cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat, kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat,
xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache,
lxmenu-data lxmenu-data, pcre
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-panel"; pname = "lxqt-panel";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "097rivly61i99v0w9a3dgbwbc4c5x9nh3jl0n94dix1qgd4w983y"; sha256 = "01xmnb17jpydyfvxwaa6kymzdasnyd94z62gjah8y4pzsmykcr4x";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
kguiaddons kguiaddons
liblxqt liblxqt
libqtxdg libqtxdg
lxqt-common
lxqt-globalkeys lxqt-globalkeys
libsysstat libsysstat
xorg.libpthreadstubs xorg.libpthreadstubs
@ -47,19 +46,19 @@ stdenv.mkDerivation rec {
alsaLib alsaLib
menu-cache menu-cache
lxmenu-data lxmenu-data
]; pcre
patches = [
(fetchpatch {
url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch;
name = "fix-compile-explicit-keyword.patch";
sha256 = "1grda0dw175kbsfq90lr5qaf79akwikzxw85jhd5f339nnramp81";
})
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = standardPatch; postPatch = ''
for dir in autostart menu; do
substituteInPlace $dir/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
done
substituteInPlace panel/CMakeLists.txt \
--replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The LXQt desktop panel"; description = "The LXQt desktop panel";

View file

@ -1,19 +1,19 @@
{ {
stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt, qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt,
libqtxdg, libqtxdg, pcre
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-policykit"; pname = "lxqt-policykit";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0sf8wj152z1xid1i2x5g1zpgh7lwq8f0rbrk3r9shyksxqcj2d8p"; sha256 = "1hxz5bxxi118g255aqb3da767va0wd25y671lk2w9r1641j8zf2d";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -31,10 +31,16 @@ stdenv.mkDerivation rec {
kwindowsystem kwindowsystem
liblxqt liblxqt
libqtxdg libqtxdg
pcre
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = ''
substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The LXQt PolicyKit agent"; description = "The LXQt PolicyKit agent";
homepage = https://github.com/lxde/lxqt-policykit; homepage = https://github.com/lxde/lxqt-policykit;

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-powermanagement"; pname = "lxqt-powermanagement";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0rcjq20ap6kc3m1f2glb8c62qhsx8qh0rkzlj3rykdj6n4hc0x79"; sha256 = "1fxklxmvjaykdpf0nj6cpgwx4yf52087g25k1zdak9n0l9n7hm8d";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = ''
substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Power management module for LXQt"; description = "Power management module for LXQt";
homepage = https://github.com/lxde/lxqt-powermanagement; homepage = https://github.com/lxde/lxqt-powermanagement;

View file

@ -1,19 +1,19 @@
{ {
stdenv, fetchFromGitHub, standardPatch, stdenv, fetchFromGitHub,
cmake, lxqt-build-tools, cmake, lxqt-build-tools,
qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, libfm-qt
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-qtplugin"; pname = "lxqt-qtplugin";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "12hyw7rk3zx51n6g2bazlqv70xap0lygm9v21ibxgy1aw0j6iy02"; sha256 = "1i1rga0pg764ccwhq7acdsckxpl1apxwj4lv4gygxxmpkrg62zkv";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -28,11 +28,13 @@ stdenv.mkDerivation rec {
qtsvg qtsvg
libdbusmenu libdbusmenu
libqtxdg libqtxdg
libfm-qt
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; postPatch = ''
substituteInPlace src/CMakeLists.txt \
postPatch = standardPatch; --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "LXQt Qt platform integration plugin"; description = "LXQt Qt platform integration plugin";

View file

@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, qtx11extras, { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras,
menu-cache, muparser }: menu-cache, muparser, pcre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-runner"; pname = "lxqt-runner";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1nsxm0fplwrzz3vccd5fm82lpl4fqss6kv558zj44vzpsl13l954"; sha256 = "1354vdaskhch1n8v3kdy15nszgqb1092csr84nbhymzgrhrq1093";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -27,14 +27,19 @@ stdenv.mkDerivation rec {
kwindowsystem kwindowsystem
liblxqt liblxqt
libqtxdg libqtxdg
lxqt-common
lxqt-globalkeys lxqt-globalkeys
menu-cache menu-cache
muparser muparser
pcre
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = ''
substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tool used to launch programs quickly by typing their names"; description = "Tool used to launch programs quickly by typing their names";
homepage = https://github.com/lxde/lxqt-runner; homepage = https://github.com/lxde/lxqt-runner;

View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, lxqt-common, xorg, xdg-user-dirs }: { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-session"; pname = "lxqt-session";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "14ahgix5jsv7fkmvz1imw9a12ygxccqrdxp9yfbpin1az9q1n1qv"; sha256 = "03gi9svxqsfjhk5ifbaalq9i44ggx8afwms1hb312czqn82wrszb";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
kwindowsystem kwindowsystem
liblxqt liblxqt
libqtxdg libqtxdg
lxqt-common
xorg.libpthreadstubs xorg.libpthreadstubs
xorg.libXdmcp xorg.libXdmcp
xdg-user-dirs xdg-user-dirs
@ -34,6 +33,13 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = ''
for dir in autostart config; do
substituteInPlace $dir/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
done
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An alternative session manager ported from the original razor-session"; description = "An alternative session manager ported from the original razor-session";
homepage = https://github.com/lxde/lxqt-session; homepage = https://github.com/lxde/lxqt-session;

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lxqt-sudo"; pname = "lxqt-sudo";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0imy4cs51im81rd0wa03wy418cdv9gqqgmwkc7v58cip7h665pyk"; sha256 = "0ql436yb51qwbnj5gbzvqi4rqx4zkmja5rdjs6yavb1x8ggn1jv6";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -0,0 +1,34 @@
{ stdenv, fetchFromGitHub, cmake, lxqt }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-themes";
version = "0.12.0";
src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
sha256 = "0f7bipkxkl741lpb2cziw9wlqy05514nqqrppsz5g4y8bmzw910n";
};
nativeBuildInputs = [
cmake
lxqt.lxqt-build-tools
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics"
substituteInPlace themes/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt"
'';
meta = with stdenv.lib; {
description = "Themes, graphics and icons for LXQt";
homepage = https://github.com/lxde/lxqt-themes;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
};
}

View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio }: { stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio, pcre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "pavucontrol-qt"; pname = "pavucontrol-qt";
version = "0.2.0"; version = "0.3.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0k7sg4dxr48nk15gpqlnkjr9gbh7r5gs0s0ydifcmw281khrzlzj"; sha256 = "1pfqdzsbygvq77npsizydps25d9g6vgw177yqvmz3cg3a68dad27";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
qt5.qttools qt5.qttools
qt5.qtx11extras qt5.qtx11extras
libpulseaudio libpulseaudio
pcre
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "pcmanfm-qt"; pname = "pcmanfm-qt";
version = "0.11.3"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "04vhfhjmz1a4rhkpb6y35hwg565047rp53rcxf4pdn0i9f6zhr4f"; sha256 = "050h5w1wph35l5m69qbxzvc96y7y0bg1m7flqdadrp688pbnzcxb";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -30,6 +30,13 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = ''
for dir in autostart config; do
substituteInPlace $dir/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
done
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)";
homepage = https://github.com/lxde/pcmanfm-qt; homepage = https://github.com/lxde/pcmanfm-qt;

View file

@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub, cmake, qt5 }:
stdenv.mkDerivation rec {
name = "${pname}_0_7_1-${version}";
pname = "qtermwidget";
version = "0.7.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ qt5.qtbase ];
meta = with stdenv.lib; {
description = "A terminal emulator widget for Qt 5";
homepage = https://github.com/lxde/qtermwidget;
license = licenses.gpl2;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
};
}

View file

@ -1,20 +1,22 @@
{ stdenv, fetchFromGitHub, cmake, qt5 }: { stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "qtermwidget"; pname = "qtermwidget";
version = "0.7.1"; version = "0.8.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz"; sha256 = "14yjz6b1l2yd7sfsxjv26yg5153fpyq23443kswkgkd9jh32gxj4";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ];
buildInputs = [ qt5.qtbase ]; buildInputs = [ qt5.qtbase qt5.qttools];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A terminal emulator widget for Qt 5"; description = "A terminal emulator widget for Qt 5";

View file

@ -6,24 +6,6 @@ let
# For compiling information, see: # For compiling information, see:
# - https://github.com/lxde/lxqt/wiki/Building-from-source # - https://github.com/lxde/lxqt/wiki/Building-from-source
standardPatch = ''
for file in $(find . -name CMakeLists.txt); do
substituteInPlace $file \
--replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg" \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
--replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt" \
--replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics" \
--replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" \
--replace "\''${LXQT_TRANSLATIONS_DIR}" share/lxqt/translations
echo ============================
echo $file
grep --color=always DESTINATION $file || true
grep --color=always share/lxqt/translations $file || true
grep --color=always platform $file || true
done
echo --------------------------------------------------------
'';
### BASE ### BASE
libqtxdg = callPackage ./base/libqtxdg { }; libqtxdg = callPackage ./base/libqtxdg { };
lxqt-build-tools = callPackage ./base/lxqt-build-tools { }; lxqt-build-tools = callPackage ./base/lxqt-build-tools { };
@ -34,7 +16,6 @@ let
libfm-qt = callPackage ./core/libfm-qt { }; libfm-qt = callPackage ./core/libfm-qt { };
lxqt-about = callPackage ./core/lxqt-about { }; lxqt-about = callPackage ./core/lxqt-about { };
lxqt-admin = callPackage ./core/lxqt-admin { }; lxqt-admin = callPackage ./core/lxqt-admin { };
lxqt-common = callPackage ./core/lxqt-common { };
lxqt-config = callPackage ./core/lxqt-config { }; lxqt-config = callPackage ./core/lxqt-config { };
lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { }; lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { };
lxqt-l10n = callPackage ./core/lxqt-l10n { }; lxqt-l10n = callPackage ./core/lxqt-l10n { };
@ -45,8 +26,11 @@ let
lxqt-qtplugin = callPackage ./core/lxqt-qtplugin { }; lxqt-qtplugin = callPackage ./core/lxqt-qtplugin { };
lxqt-session = callPackage ./core/lxqt-session { }; lxqt-session = callPackage ./core/lxqt-session { };
lxqt-sudo = callPackage ./core/lxqt-sudo { }; lxqt-sudo = callPackage ./core/lxqt-sudo { };
lxqt-themes = callPackage ./core/lxqt-themes { };
pavucontrol-qt = callPackage ./core/pavucontrol-qt { }; pavucontrol-qt = callPackage ./core/pavucontrol-qt { };
qtermwidget = callPackage ./core/qtermwidget { }; qtermwidget = callPackage ./core/qtermwidget { };
# for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0
qtermwidget_0_7_1 = callPackage ./core/qtermwidget/0.7.1.nix { };
### CORE 2 ### CORE 2
lxqt-panel = callPackage ./core/lxqt-panel { }; lxqt-panel = callPackage ./core/lxqt-panel { };
@ -84,7 +68,6 @@ let
libfm-qt libfm-qt
lxqt-about lxqt-about
lxqt-admin lxqt-admin
lxqt-common
lxqt-config lxqt-config
lxqt-globalkeys lxqt-globalkeys
lxqt-l10n lxqt-l10n
@ -95,6 +78,7 @@ let
lxqt-qtplugin lxqt-qtplugin
lxqt-session lxqt-session
lxqt-sudo lxqt-sudo
lxqt-themes
pavucontrol-qt pavucontrol-qt
### CORE 2 ### CORE 2

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "compton-conf"; pname = "compton-conf";
version = "0.2.1"; version = "0.3.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1hmirhsz010h6a6k7my1krh5nw5ds4x00c5fq6apamrdd8d4zrmq"; sha256 = "1p1y7g5psczx1dgh6gd1h5iga8rylvczkwlfirzrh0rfl45dajgb";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
preConfigure = ''
substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GUI configuration tool for compton X composite manager"; description = "GUI configuration tool for compton X composite manager";
homepage = https://github.com/lxde/compton-conf; homepage = https://github.com/lxde/compton-conf;

View file

@ -3,16 +3,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "lximage-qt"; pname = "lximage-qt";
version = "0.5.1"; version = "0.6.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0hyiarjjxjwvzinlfnfxbqx40dhgydd3ccv3xqwvj7yni1nfx7pb"; sha256 = "0zmrpfgmlq005zikyvhqbpip6mz6pfcf9aqjpncyc5vlggmh28ym";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgconfig pkgconfig

View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt, openbox, hicolor_icon_theme }: { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor_icon_theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "obconf-qt"; pname = "obconf-qt";
version = "0.11.1"; version = "0.12.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1w94g8jk2j9qrkwg3i6qwgai2sj1m657bbk2zlk9bc3qvzmwxwrc"; sha256 = "1vwza1516z7f18s5vfnhzsiyxs6afb1hgr3yqkr7qhplmq5wjma5";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
pcre
qt5.qtbase qt5.qtbase
qt5.qttools qt5.qttools
qt5.qtx11extras qt5.qtx11extras

View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
pname = "qlipper"; pname = "qlipper";
version = "5.0.0"; version = "5.0.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "pvanek"; owner = "pvanek";
repo = pname; repo = pname;
rev = version; rev = version;

View file

@ -1,39 +1,20 @@
{ stdenv, fetchFromGitHub, cmake, qt5, makeDesktopItem }: { stdenv, fetchFromGitHub, cmake, qt5 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "qps"; pname = "qps";
version = "1.10.16"; version = "1.10.17";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "QtDesktop"; owner = "QtDesktop";
repo = pname; repo = pname;
rev = "v${version}"; rev = version;
sha256 = "1s6hvqfv9hv1cl5pfsmghqn1zqhibr4plq3glzgd8s7swwdnsvjj"; sha256 = "1d5r6w9wsxjdrzq2hllrj2n1d9azy6g05hg0w0s6pikrmn1yl0a3";
};
desktopItem = makeDesktopItem {
name = "qps";
exec = "qps";
icon = "qps";
comment = "Visual process manager - Qt version of ps/top";
desktopName = "qps";
genericName = meta.description;
categories = "System;";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ qt5.qtbase qt5.qtx11extras ]; buildInputs = [ qt5.qtbase qt5.qtx11extras qt5.qttools ];
installPhase = ''
mkdir -p $out/{bin,share/{man/man1,doc,icons}}
cp -a src/qps $out/bin/
cp -a ../README.md $out/share/doc/
cp -a ../qps.1 $out/share/man/man1/
cp -a ../icon/icon.xpm $out/share/icons/qps.xpm
ln -sv "${desktopItem}/share/applications" $out/share/
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The Qt process manager"; description = "The Qt process manager";

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "qterminal"; pname = "qterminal";
version = "0.7.1"; version = "0.8.0";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxde"; owner = "lxde";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "14pfwii8axyswrkwvfmc2i0a07fjnhpyk3hh06qkbj2w3r00xhyb"; sha256 = "1899a5zc5kx7mxiyrncigqjia1k98qg526qynf4754nr9ifghxdw";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "screengrab-${version}"; name = "screengrab-${version}";
version = "1.97"; version = "1.97";
srcs = fetchFromGitHub { src = fetchFromGitHub {
owner = "QtDesktop"; owner = "QtDesktop";
repo = "screengrab"; repo = "screengrab";
rev = version; rev = version;
@ -24,10 +24,6 @@ stdenv.mkDerivation rec {
xorg.libXdmcp xorg.libXdmcp
]; ];
cmakeFlags = [ "-DSG_USE_SYSTEM_QXT=ON" "-DCMAKE_INSTALL_LIBDIR=lib" ];
NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Crossplatform tool for fast making screenshots"; description = "Crossplatform tool for fast making screenshots";
homepage = https://github.com/lxde/screengrab; homepage = https://github.com/lxde/screengrab;