Merge pull request #103050 from AndersonTorres/create-dockapps

Reorganize windowmaker dockapps
This commit is contained in:
Anderson Torres 2020-11-09 17:48:42 -03:00 committed by GitHub
commit 5e9d9f07d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 181 additions and 105 deletions

View File

@ -0,0 +1,38 @@
{ stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsaLib }:
stdenv.mkDerivation rec {
pname = "AlsaMixer.app";
version = "0.2.1";
src = dockapps-sources;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 libXpm libXext alsaLib ];
setSourceRoot = ''
export sourceRoot=$(echo */${pname})
'';
dontConfigure = true;
preInstall = ''
install -d ${placeholder "out"}/bin
'';
installPhase = ''
runHook preInstall
install -t ${placeholder "out"}/bin AlsaMixer.app
runHook postInstall
'';
postInstall = ''
ln -s ${placeholder "out"}/bin/AlsaMixer.app ${placeholder "out"}/bin/AlsaMixer
'';
meta = with stdenv.lib; {
description = "Alsa mixer application for Windowmaker";
homepage = "https://www.dockapps.net/alsamixerapp";
license = licenses.gpl2Plus;
maintainers = [ maintainers.bstrik ];
};
}

View File

@ -1,27 +0,0 @@
{ stdenv, fetchgit, pkgconfig, libX11, libXpm, libXext, alsaLib }:
stdenv.mkDerivation {
name = "alsamixer.app-0.2.1";
src = fetchgit {
url = "git://repo.or.cz/dockapps.git";
rev = "38c74350b02f35824554ce0c4f0f251d71762040";
sha256 = "0g9cwhlqg065fbhav4g4n16a4cqkk9jykl3y0zwbn5whhacfqyhl";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 libXpm libXext alsaLib ];
postUnpack = "sourceRoot=\${sourceRoot}/AlsaMixer.app";
installPhase = ''
mkdir -pv $out/bin;
cp AlsaMixer.app $out/bin/AlsaMixer;
'';
meta = {
description = "Alsa mixer application for Windowmaker";
homepage = "http://windowmaker.org/dockapps/?name=AlsaMixer.app";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.bstrik ];
};
}

View File

@ -0,0 +1,20 @@
{ config, lib, pkgs }:
lib.makeScope pkgs.newScope (self: with self; {
dockapps-sources = pkgs.fetchgit {
url = "https://repo.or.cz/dockapps.git";
rev = "b2b9d872ee61c9b329e4597c301e4417cbd9c3ea";
sha256 = "sha256-BuSnwPIj3gUWMjj++SK+117xm/77u4gXLQzRFttei0w=";
};
libdockapp = callPackage ./libdockapp.nix { };
AlsaMixer-app = callPackage ./AlsaMixer-app.nix { };
wmCalClock = callPackage ./wmCalClock.nix { };
wmsm-app = callPackage ./wmsm-app.nix { };
wmsystemtray = callPackage ./wmsystemtray.nix { };
})

View File

@ -0,0 +1,30 @@
{ stdenv, dockapps-sources, autoreconfHook, pkg-config
, libX11, libXext, libXpm, mkfontdir, fontutil }:
stdenv.mkDerivation rec {
pname = "libdockapp";
version = "0.7.3";
src = dockapps-sources;
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libX11 libXext libXpm fontutil mkfontdir ];
setSourceRoot = ''
export sourceRoot=$(echo */${pname})
'';
# There is a bug on --with-font
configureFlags = [
"--with-examples=no"
"--with-font=no"
];
meta = with stdenv.lib; {
description = "A library providing a framework for dockapps";
homepage = "https://www.dockapps.net/libdockapp";
license = licenses.gpl2Plus;
maintainers = [ maintainers.bstrik ];
};
}

View File

@ -0,0 +1,38 @@
{ stdenv, dockapps-sources
, libX11, libXpm, libXext }:
stdenv.mkDerivation rec {
pname = "wmCalClock";
version = "1.25";
src = dockapps-sources;
buildInputs = [ libX11 libXpm libXext ];
setSourceRoot = ''
export sourceRoot=$(echo */${pname}/Src)
'';
preBuild = ''
makeFlagsArray+=(
CC="cc"
INCDIR="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXpm.dev}/include"
LIBDIR="-I${libX11}/lib -I${libXext}/lib -I${libXpm}/lib"
)
'';
preInstall = ''
install -d ${placeholder "out"}/bin
install -d ${placeholder "out"}/man/man1
'';
installFlags = [ "DESTDIR=${placeholder "out"}" ];
meta = with stdenv.lib; {
description = "A Calendar clock with antialiased text";
homepage = "https://www.dockapps.net/wmcalclock";
license = licenses.gpl2Plus;
maintainers = [ maintainers.bstrik ];
platforms = platforms.linux;
};
}

View File

@ -1,32 +0,0 @@
{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }:
stdenv.mkDerivation {
name = "wmCalClock-1.25";
src = fetchurl {
url = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmCalClock-1.25.tar.gz";
sha256 = "4b42b55bb7c1d7c58b5ee1f0058c683d3e4f3e3380d3a69c54a50b983c7c1b3f";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 libXpm libXext ];
postUnpack = "sourceRoot=\${sourceRoot}/Src";
buildPhase=''
make prefix=$out
'';
installPhase = ''
mkdir -pv $out/bin
mkdir -pv $out/man/man1
make DESTDIR=$out install
'';
meta = {
description = "Clock for Windowmaker";
homepage = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html#wmcalclock";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.bstrik ];
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -0,0 +1,43 @@
{ stdenv, dockapps-sources
, libX11
, libXpm
, libXext
, libdockapp }:
stdenv.mkDerivation rec {
pname = "wmsm.app";
version = "0.2.1";
src = dockapps-sources;
buildInputs = [ libX11 libXpm libXext libdockapp ];
setSourceRoot = ''
export sourceRoot=$(echo */${pname}/wmsm)
'';
NIX_CFLAGS_COMPILE = "-std=gnu89";
postPatch = ''
substituteInPlace Makefile \
--replace "PREFIX = /usr/X11R6/bin" "" \
--replace "/usr/bin/install" "install"
'';
makeFlags = [ "CC=cc" ];
preInstall = ''
runHook preInstall
install -d ${placeholder "out"}/bin
runHook postInstall
'';
installFlags = [ "PREFIX=${placeholder "out"}/bin" ];
meta = with stdenv.lib; {
description = "System monitor for Windowmaker";
homepage = "https://www.dockapps.net/wmsmapp";
license = licenses.gpl2;
maintainers = [ maintainers.bstrik ];
};
}

View File

@ -1,29 +0,0 @@
{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }:
stdenv.mkDerivation {
name = "wmsm.app-0.2.1";
src = fetchurl {
url = "http://linux-bsd-unix.strefa.pl/wmsm.app-0.2.1.tar.bz2";
sha256 = "369a8f2e5673c6b7ab0cf85166f38fbf553dd966c3c1cfeec0e32837defd32c7";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 libXpm libXext ];
postUnpack = "sourceRoot=\${sourceRoot}/wmsm";
NIX_CFLAGS_COMPILE = "-std=gnu89";
installPhase = ''
substituteInPlace Makefile --replace "PREFIX = /usr/X11R6/bin" "" --replace "/usr/bin/install" "install"
mkdir -pv $out/bin;
make PREFIX=$out/bin install;
'';
meta = {
description = "System monitor for Windowmaker";
homepage = "http://linux-bsd-unix.strefa.pl";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.bstrik ];
};
}

View File

@ -1,20 +1,22 @@
{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }:
stdenv.mkDerivation {
name = "wmsystemtray-1.4";
stdenv.mkDerivation rec {
pname = "wmsystemtray";
version = "1.4";
src = fetchurl {
url = "mirror://sourceforge/project/wmsystemtray/wmsystemtray/wmsystemtray-1.4.tar.gz";
sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9";
url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k=";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 libXpm libXext libXfixes libXmu ];
meta = {
description = "Systemtray for Windowmaker";
meta = with stdenv.lib; {
description = "A system tray for Windowmaker";
homepage = "http://wmsystemtray.sourceforge.net";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.bstrik ];
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl2Only;
maintainers = [ maintainers.bstrik ];
platforms = platforms.linux;
};
}

View File

@ -24327,6 +24327,7 @@ in
windowlab = callPackage ../applications/window-managers/windowlab { };
windowmaker = callPackage ../applications/window-managers/windowmaker { };
dockapps = callPackage ../applications/window-managers/windowmaker/dockapps { };
wily = callPackage ../applications/editors/wily { };
@ -24336,16 +24337,8 @@ in
write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { };
alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { };
wllvm = callPackage ../development/tools/wllvm { };
wmcalclock = callPackage ../applications/window-managers/windowmaker/dockapps/wmcalclock.nix { };
wmsm.app = callPackage ../applications/window-managers/windowmaker/dockapps/wmsm.app.nix { };
wmsystemtray = callPackage ../applications/window-managers/windowmaker/dockapps/wmsystemtray.nix { };
wmname = callPackage ../applications/misc/wmname { };
wmctrl = callPackage ../tools/X11/wmctrl { };