From 2cc1860fafda2d77254369d0f8db71e314e8bcf0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 9 Nov 2020 17:32:21 -0300 Subject: [PATCH 1/8] Dockapps: cleanup --- .../windowmaker/dockapps/alsamixer.app.nix | 27 ---------------- .../windowmaker/dockapps/wmcalclock.nix | 32 ------------------- .../windowmaker/dockapps/wmsm.app.nix | 29 ----------------- .../windowmaker/dockapps/wmsystemtray.nix | 20 ------------ pkgs/top-level/all-packages.nix | 8 ----- 5 files changed, 116 deletions(-) delete mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix delete mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix delete mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix delete mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix deleted file mode 100644 index 4e1256399e7..00000000000 --- a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix deleted file mode 100644 index 48f4753d674..00000000000 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix deleted file mode 100644 index ad255414a69..00000000000 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix deleted file mode 100644 index 3e073cd8e91..00000000000 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }: - -stdenv.mkDerivation { - name = "wmsystemtray-1.4"; - src = fetchurl { - url = "mirror://sourceforge/project/wmsystemtray/wmsystemtray/wmsystemtray-1.4.tar.gz"; - sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXpm libXext libXfixes libXmu ]; - - meta = { - description = "Systemtray for Windowmaker"; - homepage = "http://wmsystemtray.sourceforge.net"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bstrik ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f881a85cca..db3cc203d8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24331,16 +24331,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 { }; From ce009bb0e26008a4272d06b7c35eeb1b6a2ff134 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 8 Nov 2020 23:06:35 -0300 Subject: [PATCH 2/8] Dockapps: new structure --- .../window-managers/windowmaker/dockapps/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+) create mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/default.nix diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix new file mode 100644 index 00000000000..ffa2b92cb6f --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix @@ -0,0 +1,4 @@ +{ config, lib, pkgs }: + +lib.makeScope pkgs.newScope (self: with self; { +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db3cc203d8f..bbd62d5355c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24322,6 +24322,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 { }; From 8741edb2ec222c23b520bdc20cd9181238869d68 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 8 Nov 2020 23:08:10 -0300 Subject: [PATCH 3/8] Dockapps: fetch sources Most of dockapps live in a monorepo maintained by dockapps.net. Unfortunately there is not an obvious way to fix a particular release, tag or whatever from this monorepo. --- .../window-managers/windowmaker/dockapps/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix index ffa2b92cb6f..710408fc6e5 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix @@ -1,4 +1,11 @@ { 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="; + }; + }) From 04e33d64aaf04881058bd951cd9cbfd0bd3794d2 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 8 Nov 2020 23:12:25 -0300 Subject: [PATCH 4/8] libdockapp: init at 0.7.3 --- .../windowmaker/dockapps/default.nix | 1 + .../windowmaker/dockapps/libdockapp.nix | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix index 710408fc6e5..5668189402c 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix @@ -8,4 +8,5 @@ lib.makeScope pkgs.newScope (self: with self; { sha256 = "sha256-BuSnwPIj3gUWMjj++SK+117xm/77u4gXLQzRFttei0w="; }; + libdockapp = callPackage ./libdockapp.nix { }; }) diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix b/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix new file mode 100644 index 00000000000..bcdef42a78a --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nix @@ -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 ]; + }; +} From 7a7b4b49d594ebd244f0f1538a75954379a34629 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 8 Nov 2020 23:22:43 -0300 Subject: [PATCH 5/8] AlsaMixer-app: stay at 0.2.1 --- .../windowmaker/dockapps/AlsaMixer-app.nix | 38 +++++++++++++++++++ .../windowmaker/dockapps/default.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix new file mode 100644 index 00000000000..4ec02164401 --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix @@ -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 ]; + }; +} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix index 5668189402c..3f96d3ef6b4 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix @@ -9,4 +9,6 @@ lib.makeScope pkgs.newScope (self: with self; { }; libdockapp = callPackage ./libdockapp.nix { }; + + AlsaMixer-app = callPackage ./AlsaMixer-app.nix { }; }) From 9f20bdc582f7adec3b96a8b67450f19d458339b2 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 8 Nov 2020 23:24:51 -0300 Subject: [PATCH 6/8] wmCalClock: stay at 1.25 --- .../windowmaker/dockapps/default.nix | 2 + .../windowmaker/dockapps/wmCalClock.nix | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix index 3f96d3ef6b4..536c70445e2 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix @@ -11,4 +11,6 @@ lib.makeScope pkgs.newScope (self: with self; { libdockapp = callPackage ./libdockapp.nix { }; AlsaMixer-app = callPackage ./AlsaMixer-app.nix { }; + + wmCalClock = callPackage ./wmCalClock.nix { }; }) diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix new file mode 100644 index 00000000000..f8ea781858a --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nix @@ -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; + }; +} From dc4a01d8f5bc8ebe107347e0e942fddafbba023c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 8 Nov 2020 23:28:03 -0300 Subject: [PATCH 7/8] wmsm-app: stay at 0.2.1 --- .../windowmaker/dockapps/default.nix | 2 + .../windowmaker/dockapps/wmsm-app.nix | 43 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix index 536c70445e2..489bc8db7d8 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix @@ -13,4 +13,6 @@ lib.makeScope pkgs.newScope (self: with self; { AlsaMixer-app = callPackage ./AlsaMixer-app.nix { }; wmCalClock = callPackage ./wmCalClock.nix { }; + + wmsm-app = callPackage ./wmsm-app.nix { }; }) diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix new file mode 100644 index 00000000000..dd25ee2b2fc --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix @@ -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 ]; + }; +} From 46bc1e2f8678fa223fdceb69c7a2bc22be270b30 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 8 Nov 2020 23:29:15 -0300 Subject: [PATCH 8/8] wmsystemtray: stay at 1.4 --- .../windowmaker/dockapps/default.nix | 2 ++ .../windowmaker/dockapps/wmsystemtray.nix | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix index 489bc8db7d8..8a66fdbd67f 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/default.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/default.nix @@ -15,4 +15,6 @@ lib.makeScope pkgs.newScope (self: with self; { wmCalClock = callPackage ./wmCalClock.nix { }; wmsm-app = callPackage ./wmsm-app.nix { }; + + wmsystemtray = callPackage ./wmsystemtray.nix { }; }) diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix new file mode 100644 index 00000000000..6ec62af5d36 --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }: + +stdenv.mkDerivation rec { + pname = "wmsystemtray"; + version = "1.4"; + + src = fetchurl { + url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}.tar.gz"; + sha256 = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k="; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXpm libXext libXfixes libXmu ]; + + meta = with stdenv.lib; { + description = "A system tray for Windowmaker"; + homepage = "http://wmsystemtray.sourceforge.net"; + license = licenses.gpl2Only; + maintainers = [ maintainers.bstrik ]; + platforms = platforms.linux; + }; +}