diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | configuration.nix | 2 | ||||
| -rw-r--r-- | packages/dwmblocks/pkg.nix | 19 | ||||
| m--------- | packages/dwmblocks/source | 0 | ||||
| -rw-r--r-- | packages/shotkey/pkg.nix | 2 |
5 files changed, 25 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index d06f01c..ddf12a0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "packages/dmenu/source"] path = packages/dmenu/source url = git@github.com:phenax/dmenu.git +[submodule "packages/dwmblocks/source"] + path = packages/dwmblocks/source + url = git@github.com:phenax/dwmblocks.git diff --git a/configuration.nix b/configuration.nix index c010479..ee698bc 100644 --- a/configuration.nix +++ b/configuration.nix @@ -10,6 +10,7 @@ let sensible-apps = pkgs.callPackage ./packages/sensible-apps/pkg.nix {}; shotkey = pkgs.callPackage ./packages/shotkey/pkg.nix {}; dwm = pkgs.callPackage ./packages/dwm/pkg.nix {}; + dwmBlocks = pkgs.callPackage ./packages/dwmblocks/pkg.nix {}; st = pkgs.callPackage ./packages/st/pkg.nix {}; # Config @@ -169,6 +170,7 @@ in { sensible-apps shotkey dwm + dwmBlocks st dmenu diff --git a/packages/dwmblocks/pkg.nix b/packages/dwmblocks/pkg.nix new file mode 100644 index 0000000..79a23f8 --- /dev/null +++ b/packages/dwmblocks/pkg.nix @@ -0,0 +1,19 @@ +{ stdenv, libX11, pkgconfig }: +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "local-dwmblocks-${version}"; + version = "0.1.0"; + + src = ./source; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 ]; + + + unpackPhase = ''cp -r $src/* .''; + + buildPhase = ''make''; + + installPhase = ''make PREFIX=$out DESTDIR="" install''; +} diff --git a/packages/dwmblocks/source b/packages/dwmblocks/source new file mode 160000 +Subproject 1b7209ba919e0213521c88a8a85a2284ae5dac9 diff --git a/packages/shotkey/pkg.nix b/packages/shotkey/pkg.nix index eb21186..3a9eea7 100644 --- a/packages/shotkey/pkg.nix +++ b/packages/shotkey/pkg.nix @@ -1,4 +1,4 @@ -{ stdenv, libX11, libXinerama, libXft }: +{ stdenv, libX11 }: with stdenv.lib; stdenv.mkDerivation rec { |