commit 1b1d7e93dc85faf2e271291aff14f03d80f96460 · pyrox.dev/nixpkgs

+51 -14

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

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub

     

       2
       2
       -
       , meson, ninja, pkg-config, wayland, scdoc, makeWrapper

     

       3
       3
       -
       , wlroots, wayland-protocols, pixman, libxkbcommon

     

       4
       4
       -
       , cairo , pango, fontconfig, pandoc, systemd, mesa

     

       5
       5
       -
       , withXwayland ? true, xwayland

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , cairo

     

       5
       5
       +
       , fontconfig

     

       6
       6
       +
       , libxkbcommon

     

       7
       7
       +
       , makeWrapper

     

       8
       8
       +
       , mesa

     

       9
       9
       +
       , meson

     

       10
       10
       +
       , ninja

     

       6
       11
        
       , nixosTests

     

       12
       12
       +
       , pandoc

     

       13
       13
       +
       , pango

     

       14
       14
       +
       , pixman

     

       15
       15
       +
       , pkg-config

     

       16
       16
       +
       , scdoc

     

       17
       17
       +
       , systemd

     

       18
       18
       +
       , wayland

     

       19
       19
       +
       , wayland-protocols

     

       20
       20
       +
       , withXwayland ? true , xwayland

     

       21
       21
       +
       , wlroots

     

       7
       22
        
       }:

     

       8
       23
        
       

     

       9
       24
        
       stdenv.mkDerivation rec {

     

       10
       25
        
         pname = "cagebreak";

     

       11
       11
       -
         version = "1.6.0";

     

       26
       26
       +
         version = "1.7.0";

     

       12
       27
        
       

     

       13
       28
        
         src = fetchFromGitHub {

     

       14
       29
        
           owner = "project-repo";

     

       15
       15
       -
           repo = "cagebreak";

     

       30
       30
       +
           repo = pname;

     

       16
       31
        
           rev = version;

     

       17
       17
       -
           hash = "sha256-F7fqDVbJS6pVgmj6C1/l9PAaz5yzcYpaq6oc6a6v/Qk=";

     

       32
       32
       +
           hash = "sha256-HpAjJHu5sxZKof3ydnU3wcP5GpnH6Ax8m1T1vVoq+oI=";

     

       18
       33
        
         };

     

       19
       34
        
       

     

       20
       20
       -
         nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ];

     

       35
       35
       +
         nativeBuildInputs = [

     

       36
       36
       +
           makeWrapper

     

       37
       37
       +
           meson

     

       38
       38
       +
           ninja

     

       39
       39
       +
           pandoc

     

       40
       40
       +
           pkg-config

     

       41
       41
       +
           scdoc

     

       42
       42
       +
           wayland

     

       43
       43
       +
         ];

     

       21
       44
        
       

     

       22
       45
        
         buildInputs = [

     

       23
       23
       -
           wlroots wayland wayland-protocols pixman libxkbcommon cairo

     

       24
       24
       -
           pango fontconfig pandoc systemd

     

       46
       46
       +
           cairo

     

       47
       47
       +
           fontconfig

     

       48
       48
       +
           libxkbcommon

     

       25
       49
        
           mesa # for libEGL headers

     

       50
       50
       +
           pango

     

       51
       51
       +
           pixman

     

       52
       52
       +
           systemd

     

       53
       53
       +
           wayland

     

       54
       54
       +
           wayland-protocols

     

       55
       55
       +
           wlroots

     

       26
       56
        
         ];

     

       27
       57
        
       

     

       28
       28
       -
         outputs = [ "out" "contrib" ];

     

       58
       58
       +
         outputs = [

     

       59
       59
       +
           "out"

     

       60
       60
       +
           "contrib"

     

       61
       61
       +
         ];

     

       29
       62
        
       

     

       30
       63
        
         mesonFlags = [

     

       31
       31
       -
           "-Dxwayland=${lib.boolToString withXwayland}"

     

       32
       32
       -
           "-Dversion_override=${version}"

     

       33
       64
        
           "-Dman-pages=true"

     

       65
       65
       +
           "-Dversion_override=${version}"

     

       66
       66
       +
           "-Dxwayland=${lib.boolToString withXwayland}"

     

       34
       67
        
         ];

     

       68
       68
       +
       

     

       69
       69
       +
         postPatch = ''

     

       70
       70
       +
           sed -i -e 's|<drm_fourcc.h>|<libdrm/drm_fourcc.h>|' *.c

     

       71
       71
       +
         '';

     

       35
       72
        
       

     

       36
       73
        
         postInstall = ''

     

       37
       74
        
           mkdir -p $contrib/share/cagebreak

+1 -3

pkgs/top-level/all-packages.nix

···

       31281
       31281
        
       

     

       31282
       31282
        
         bottom = callPackage ../tools/system/bottom {};

     

       31283
       31283
        
       

     

       31284
       31284
       -
         cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix {

     

       31285
       31285
       -
           wlroots = wlroots_0_12;

     

       31286
       31286
       -
         };

     

       31284
       31284
       +
         cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { };

     

       31287
       31285
        
       

     

       31288
       31286
        
         psftools = callPackage ../os-specific/linux/psftools {};

     

       31289
       31287