summary refs log tree commit diff
diff options
context:
space:
mode:
authorlethalman <lucabru@src.gnome.org>2015-03-12 11:33:01 +0100
committerlethalman <lucabru@src.gnome.org>2015-03-12 11:33:01 +0100
commite8ff24b034226aa32eae5e6bd65b6e0555c19cf5 (patch)
treecd398a6c3e334d8a763d168d72655a5f270ba323
parente19ab844358a9318077e1285c4ecf0a82bbe4b87 (diff)
parent9d7f4843d8575329e8fcf34882f967e5bdf3e5c5 (diff)
downloadnixlib-e8ff24b034226aa32eae5e6bd65b6e0555c19cf5.tar
nixlib-e8ff24b034226aa32eae5e6bd65b6e0555c19cf5.tar.gz
nixlib-e8ff24b034226aa32eae5e6bd65b6e0555c19cf5.tar.bz2
nixlib-e8ff24b034226aa32eae5e6bd65b6e0555c19cf5.tar.lz
nixlib-e8ff24b034226aa32eae5e6bd65b6e0555c19cf5.tar.xz
nixlib-e8ff24b034226aa32eae5e6bd65b6e0555c19cf5.tar.zst
nixlib-e8ff24b034226aa32eae5e6bd65b6e0555c19cf5.zip
Merge pull request #6759 from bstrik/master
2 more windowmaker dockapps
-rw-r--r--pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix26
-rw-r--r--pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix26
-rw-r--r--pkgs/top-level/all-packages.nix4
3 files changed, 56 insertions, 0 deletions
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 000000000000..11e5460fecbc
--- /dev/null
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix
@@ -0,0 +1,26 @@
+{ 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";
+  };
+
+  buildInputs = [ pkgconfig 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/wmsm.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix
new file mode 100644
index 000000000000..6fe49745fa76
--- /dev/null
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix
@@ -0,0 +1,26 @@
+{ 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";
+  };
+
+  buildInputs = [ pkgconfig libX11 libXpm libXext ];
+
+  postUnpack = "sourceRoot=\${sourceRoot}/wmsm";
+
+  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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 818a3db8b230..81a3e392dd71 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11913,8 +11913,12 @@ let
 
   windowmaker = callPackage ../applications/window-managers/windowmaker { };
 
+  alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { };
+
   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 { };
 
   winswitch = callPackage ../tools/X11/winswitch { };