commit 25bcf382c63d9297b1ecbc7f458cbf48009e63ca · pyrox.dev/nixpkgs

+13 -8

pkgs/applications/window-managers/icewm/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , fetchFromGitHub

     

       3
       4
        
       , cmake

     

       4
       5
        
       , pkg-config

     

       5
       5
       -
       , perl

     

       6
       6
        
       , asciidoc

     

       7
       7
        
       , expat

     

       8
       8
        
       , fontconfig

     
···

       34
       34
        
       , libxcb

     

       35
       35
        
       , mkfontdir

     

       36
       36
        
       , pcre

     

       37
       37
       +
       , perl

     

       37
       38
        
       }:

     

       38
       39
        
       

     

       39
       40
        
       stdenv.mkDerivation rec {

     

       40
       41
        
         pname = "icewm";

     

       41
       41
       -
         version = "2.1.2";

     

       42
       42
       +
         version = "2.2.0";

     

       42
       43
        
       

     

       43
       44
        
         src = fetchFromGitHub {

     

       44
       45
        
           owner  = "bbidulock";

     

       45
       46
        
           repo = pname;

     

       46
       47
        
           rev = version;

     

       47
       47
       -
           sha256 = "sha256-n9mLD1WrHsO9W1rxopFQENxQEHp/sxuixV3PxLp2vOY=";

     

       48
       48
       +
           hash = "sha256-STM8t311lf0xIqs2Onmwg48xgE7V9VZrUfJrUzYRxL4=";

     

       48
       49
        
         };

     

       49
       50
        
       

     

       50
       50
       -
         nativeBuildInputs = [ cmake pkg-config perl asciidoc ];

     

       51
       51
       -
       

     

       51
       51
       +
         nativeBuildInputs = [

     

       52
       52
       +
           asciidoc

     

       53
       53
       +
           cmake

     

       54
       54
       +
           perl

     

       55
       55
       +
           pkg-config

     

       56
       56
       +
         ];

     

       52
       57
        
         buildInputs = [

     

       53
       58
        
           expat

     

       54
       59
        
           fontconfig

     
···

       90
       95
        
         '';

     

       91
       96
        
       

     

       92
       97
        
         meta = with lib; {

     

       98
       98
       +
           homepage = "https://www.ice-wm.org/";

     

       93
       99
        
           description = "A simple, lightweight X window manager";

     

       94
       100
        
           longDescription = ''

     

       95
       101
        
             IceWM is a window manager for the X Window System. The goal of IceWM is

     
···

       104
       110
        
             includes an optional external background wallpaper manager with

     

       105
       111
        
             transparency support, a simple session manager and a system tray.

     

       106
       112
        
           '';

     

       107
       107
       -
           homepage = "https://www.ice-wm.org/";

     

       108
       108
       -
           license = licenses.lgpl2;

     

       113
       113
       +
           license = licenses.lgpl2Only;

     

       109
       114
        
           maintainers = [ maintainers.AndersonTorres ];

     

       110
       115
        
           platforms = platforms.linux;

     

       111
       116
        
         };

+51 -25

pkgs/applications/window-managers/sawfish/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , fetchurl

     

       3
       3
       -
       , pkg-config

     

       4
       4
       -
       , which

     

       5
       4
        
       , autoreconfHook

     

       6
       6
       -
       , rep-gtk

     

       7
       7
       -
       , pango

     

       8
       5
        
       , gdk-pixbuf-xlib

     

       6
       6
       +
       , gettext

     

       7
       7
       +
       , gtk2

     

       9
       8
        
       , imlib

     

       10
       10
       -
       , gettext

     

       11
       11
       -
       , texinfo

     

       9
       9
       +
       , libICE

     

       10
       10
       +
       , libSM

     

       12
       11
        
       , libXinerama

     

       13
       12
        
       , libXrandr

     

       14
       13
        
       , libXtst

     

       15
       15
       -
       , libICE

     

       16
       16
       -
       , libSM

     

       14
       14
       +
       , librep

     

       17
       15
        
       , makeWrapper

     

       16
       16
       +
       , pango

     

       17
       17
       +
       , pkg-config

     

       18
       18
       +
       , rep-gtk

     

       19
       19
       +
       , texinfo

     

       20
       20
       +
       , which

     

       18
       21
        
       }:

     

       19
       22
        
       

     

       20
       23
        
       stdenv.mkDerivation rec {

     
···

       26
       29
        
           sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31";

     

       27
       30
        
         };

     

       28
       31
        
       

     

       29
       29
       -
         nativeBuildInputs = [ autoreconfHook pkg-config ];

     

       30
       30
       -
         buildInputs = [ which

     

       31
       31
       -
           rep-gtk pango gdk-pixbuf-xlib imlib gettext texinfo

     

       32
       32
       -
           libXinerama libXrandr libXtst libICE libSM

     

       33
       33
       -
           makeWrapper ];

     

       32
       32
       +
         nativeBuildInputs = [

     

       33
       33
       +
           autoreconfHook

     

       34
       34
       +
           gettext

     

       35
       35
       +
           librep

     

       36
       36
       +
           makeWrapper

     

       37
       37
       +
           pkg-config

     

       38
       38
       +
           texinfo

     

       39
       39
       +
           which

     

       40
       40
       +
         ];

     

       41
       41
       +
         buildInputs = [

     

       42
       42
       +
           gdk-pixbuf-xlib

     

       43
       43
       +
           gtk2

     

       44
       44
       +
           imlib

     

       45
       45
       +
           libICE

     

       46
       46
       +
           libSM

     

       47
       47
       +
           libXinerama

     

       48
       48
       +
           libXrandr

     

       49
       49
       +
           libXtst

     

       50
       50
       +
           librep

     

       51
       51
       +
           pango

     

       52
       52
       +
           rep-gtk

     

       53
       53
       +
         ];

     

       34
       54
        
       

     

       35
       35
       -
         patchPhase = ''

     

       55
       55
       +
         postPatch = ''

     

       36
       56
        
           sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in

     

       37
       57
        
           sed -e 's|$(repexecdir)|$(libdir)/rep|g' -i src/Makefile.in

     

       38
       58
        
         '';

     

       39
       59
        
       

     

       60
       60
       +
         strictDeps = true;

     

       61
       61
       +
       

     

       40
       62
        
         postInstall = ''

     

       41
       41
       -
           for i in $out/lib/sawfish/sawfish-menu $out/bin/sawfish-about \

     

       42
       42
       -
                    $out/bin/sawfish-client $out/bin/sawfish-config $out/bin/sawfish; do

     

       63
       63
       +
           for i in $out/lib/sawfish/sawfish-menu \

     

       64
       64
       +
                    $out/bin/sawfish-about \

     

       65
       65
       +
                    $out/bin/sawfish-client \

     

       66
       66
       +
                    $out/bin/sawfish-config \

     

       67
       67
       +
                    $out/bin/sawfish; do

     

       43
       68
        
             wrapProgram $i \

     

       44
       69
        
               --prefix REP_DL_LOAD_PATH : "$out/lib/rep" \

     

       45
       70
        
               --set REP_LOAD_PATH "$out/share/sawfish/lisp"

     
···

       47
       72
        
         '';

     

       48
       73
        
       

     

       49
       74
        
         meta = with lib; {

     

       75
       75
       +
           homepage = "http://sawfish.tuxfamily.org/";

     

       50
       76
        
           description = "An extensible, Lisp-based window manager";

     

       51
       77
        
           longDescription = ''

     

       52
       52
       -
             Sawfish is an extensible window manager using a Lisp-based scripting language.

     

       53
       53
       -
             Its policy is very minimal compared to most window managers. Its aim is simply

     

       54
       54
       -
             to manage windows in the most flexible and attractive manner possible.

     

       55
       55
       -
             All high-level WM functions are implemented in Lisp for future extensibility

     

       56
       56
       -
             or redefinition.

     

       78
       78
       +
             Sawfish is an extensible window manager using a Lisp-based scripting

     

       79
       79
       +
             language. Its policy is very minimal compared to most window managers. Its

     

       80
       80
       +
             aim is simply to manage windows in the most flexible and attractive manner

     

       81
       81
       +
             possible. All high-level WM functions are implemented in Lisp for future

     

       82
       82
       +
             extensibility or redefinition.

     

       57
       83
        
           '';

     

       58
       58
       -
           homepage = "https://sawfish.fandom.com/wiki/Main_Page";

     

       59
       59
       -
           license = licenses.gpl2;

     

       60
       60
       -
           maintainers = [ maintainers.AndersonTorres ];

     

       84
       84
       +
           license = licenses.gpl2Plus;

     

       85
       85
       +
           maintainers = with maintainers; [ AndersonTorres ];

     

       86
       86
       +
           platforms = platforms.unix;

     

       61
       87
        
         };

     

       62
       88
        
       }

+31 -19

pkgs/development/libraries/librep/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl

     

       2
       2
       -
       , pkg-config, autoreconfHook

     

       3
       3
       -
       , readline, texinfo

     

       4
       4
       -
       , gdbm, gmp, libffi }:

     

       5
       5
       -
       

     

       6
       6
       -
       with lib;

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , autoreconfHook

     

       5
       5
       +
       , gdbm

     

       6
       6
       +
       , gmp

     

       7
       7
       +
       , libffi

     

       8
       8
       +
       , pkg-config

     

       9
       9
       +
       , readline

     

       10
       10
       +
       , texinfo

     

       11
       11
       +
       }:

     

       7
       12
        
       

     

       8
       13
        
       stdenv.mkDerivation rec {

     

       9
       14
        
         pname = "librep";

     

       10
       15
        
         version = "0.92.7";

     

       11
       11
       -
         sourceName = "librep_${version}";

     

       12
       16
        
       

     

       13
       17
        
         src = fetchurl {

     

       14
       14
       -
           url = "https://download.tuxfamily.org/librep/${sourceName}.tar.xz";

     

       18
       18
       +
           url = "https://download.tuxfamily.org/${pname}/${pname}_${version}.tar.xz";

     

       15
       19
        
           sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8";

     

       16
       20
        
         };

     

       17
       21
        
       

     

       18
       18
       -
         nativeBuildInputs = [ autoreconfHook pkg-config ];

     

       19
       19
       -
         buildInputs = [ readline texinfo ];

     

       20
       20
       -
         propagatedBuildInputs = [ gdbm gmp libffi ];

     

       22
       22
       +
         nativeBuildInputs = [

     

       23
       23
       +
           autoreconfHook

     

       24
       24
       +
           pkg-config

     

       25
       25
       +
           texinfo

     

       26
       26
       +
         ];

     

       27
       27
       +
         buildInputs = [

     

       28
       28
       +
           gdbm

     

       29
       29
       +
           gmp

     

       30
       30
       +
           libffi

     

       31
       31
       +
           readline

     

       32
       32
       +
         ];

     

       21
       33
        
       

     

       22
       34
        
         setupHook = ./setup-hook.sh;

     

       23
       35
        
       

     

       24
       24
       -
         meta = {

     

       36
       36
       +
         meta = with lib;{

     

       37
       37
       +
           homepage = "http://sawfish.tuxfamily.org/";

     

       25
       38
        
           description = "Fast, lightweight, and versatile Lisp environment";

     

       26
       39
        
           longDescription = ''

     

       27
       27
       -
             librep is a Lisp system for UNIX, comprising an

     

       28
       28
       -
             interpreter, a byte-code compiler, and a virtual

     

       29
       29
       -
             machine. It can serve as an application extension language

     

       30
       30
       -
             but is also suitable for standalone scripts.

     

       31
       31
       -
            '';

     

       32
       32
       -
           homepage = "http://sawfish.wikia.com";

     

       33
       33
       -
           license = licenses.gpl2;

     

       40
       40
       +
             librep is a Lisp system for UNIX, comprising an interpreter, a byte-code

     

       41
       41
       +
             compiler, and a virtual machine. It can serve as an application extension

     

       42
       42
       +
             language but is also suitable for standalone scripts.

     

       43
       43
       +
           '';

     

       44
       44
       +
           license = licenses.gpl2Plus;

     

       34
       45
        
           maintainers = [ maintainers.AndersonTorres ];

     

       46
       46
       +
           platforms = platforms.unix;

     

       35
       47
        
         };

     

       36
       48
        
       }

     

       37
       49
        
       # TODO: investigate fetchFromGithub

+21 -11

pkgs/development/libraries/rep-gtk/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, pkg-config, autoreconfHook, librep, gtk2 }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , autoreconfHook

     

       5
       5
       +
       , gtk2

     

       6
       6
       +
       , librep

     

       7
       7
       +
       , pkg-config

     

       8
       8
       +
       }:

     

       2
       9
        
       

     

       3
       3
       -
       with lib;

     

       4
       10
        
       stdenv.mkDerivation rec {

     

       5
       5
       -
       

     

       6
       11
        
         pname = "rep-gtk";

     

       7
       12
        
         version = "0.90.8.3";

     

       8
       8
       -
         sourceName = "rep-gtk_${version}";

     

       9
       13
        
       

     

       10
       14
        
         src = fetchurl {

     

       11
       11
       -
           url = "https://download.tuxfamily.org/librep/rep-gtk/${sourceName}.tar.xz";

     

       15
       15
       +
           url = "https://download.tuxfamily.org/librep/${pname}/${pname}_${version}.tar.xz";

     

       12
       16
        
           sha256 = "0hgkkywm8zczir3lqr727bn7ybgg71x9cwj1av8fykkr8pdpard9";

     

       13
       17
        
         };

     

       14
       18
        
       

     

       15
       15
       -
         nativeBuildInputs = [ autoreconfHook pkg-config ];

     

       16
       16
       -
         buildInputs = [ ];

     

       17
       17
       -
         propagatedBuildInputs = [ librep gtk2 ];

     

       19
       19
       +
         nativeBuildInputs = [

     

       20
       20
       +
           autoreconfHook

     

       21
       21
       +
           pkg-config

     

       22
       22
       +
         ];

     

       23
       23
       +
         buildInputs = [

     

       24
       24
       +
           gtk2

     

       25
       25
       +
           librep

     

       26
       26
       +
         ];

     

       18
       27
        
       

     

       19
       28
        
         patchPhase = ''

     

       20
       29
        
           sed -e 's|installdir=$(repexecdir)|installdir=$(libdir)/rep|g' -i Makefile.in

     

       21
       30
        
         '';

     

       22
       31
        
       

     

       23
       23
       -
         meta = {

     

       32
       32
       +
         meta = with lib; {

     

       33
       33
       +
           homepage = "http://sawfish.tuxfamily.org";

     

       24
       34
        
           description = "GTK bindings for librep";

     

       25
       25
       -
           homepage = "http://sawfish.wikia.com";

     

       26
       26
       -
           license = licenses.gpl2;

     

       35
       35
       +
           license = licenses.gpl2Plus;

     

       27
       36
        
           maintainers = [ maintainers.AndersonTorres ];

     

       37
       37
       +
           platforms = platforms.unix;

     

       28
       38
        
         };

     

       29
       39
        
       }

     

       30
       40
        
       # TODO: investigate fetchFromGithub