public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86265 from christianharke/spectrwm-bump

Browse Source 
spectrwm: 2.7.2 -> 3.3.0
This commit is contained in:
Jörg Thalheim 2020-04-29 22:12:32 +01:00 committed by GitHub
commit bb5e20e4c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
maintainers/maintainer-list.nix
View File

@ -1406,6 +1406,16 @@
githubId = 1103294; githubId = 1103294;
name = "Christopher Rosset"; name = "Christopher Rosset";
}; };
christianharke = {
email = "christian@harke.ch";
github = "christianharke";
githubId = 13007345;
name = "Christian Harke";
keys = [{
longkeyid = "rsa4096/0x830A9728630966F4";
fingerprint = "4EBB 30F1 E89A 541A A7F2 52BE 830A 9728 6309 66F4";
}];
};
christopherpoole = { christopherpoole = {
email = "mail@christopherpoole.net"; email = "mail@christopherpoole.net";
github = "christopherpoole"; github = "christopherpoole";

38
pkgs/applications/window-managers/spectrwm/default.nix
View File

@ -1,51 +1,37 @@
{ fetchurl { stdenv, fetchFromGitHub, pkgconfig, xorg }:
, libX11
, libXrandr
, libXcursor
, libXft
, libXt
, libxcb
, xcbutil
, xcb-util-cursor
, xcbutilkeysyms
, xcbutilwm
, stdenv
}:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "spectrwm"; pname = "spectrwm";
version = "2.7.2"; version = "3.3.0";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/conformal/spectrwm/archive/SPECTRWM_2_7_2.tar.gz"; owner = "conformal";
sha256 = "1yssqnhxlfl1b60gziqp8c5pzs1lr8p6anrnp9ga1zfdql3b7993"; repo = "spectrwm";
rev = "SPECTRWM_3_3_0";
sha256 = "139mswlr0z5dbp5migm98qqg84syq0py1qladp3226xy6q3bnn08";
}; };
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = with xorg; [
libX11
libxcb
libXrandr libXrandr
libXcursor libXcursor
libXft libXft
libXt libXt
xcbutil xcbutil
xcb-util-cursor
xcbutilkeysyms xcbutilkeysyms
xcbutilwm xcbutilwm
]; ];
sourceRoot = let sourceRoot = let
subdir = if stdenv.isDarwin then "osx" else "linux"; subdir = if stdenv.isDarwin then "osx" else "linux";
in "spectrwm-SPECTRWM_2_7_2/${subdir}"; in "source/${subdir}";
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=${placeholder "out"}" ];
installPhase = "PREFIX=$out make install";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A tiling window manager"; description = "A tiling window manager";
homepage = "https://github.com/conformal/spectrwm"; homepage = "https://github.com/conformal/spectrwm";
maintainers = with maintainers; [ jb55 ]; maintainers = with maintainers; [ christianharke ];
license = licenses.isc; license = licenses.isc;
platforms = platforms.all; platforms = platforms.all;