commit bcfe03cc120ce431efd0c041b5df0205e15d99ba · pyrox.dev/nixpkgs

+18 -6

pkgs/development/libraries/wlroots/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, meson, ninja, pkgconfig

     

       2
       2
        
       , wayland, mesa_noglu, wayland-protocols, libinput, libxkbcommon, pixman

     

       3
       3
       -
       , xcbutilwm, libX11, libcap

     

       3
       3
       +
       , xcbutilwm, libX11, libcap, xcbutilimage

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       let pname = "wlroots";

     

       7
       7
       -
           version = "unstable-2017-10-31";

     

       7
       7
       +
           version = "unstable-2017-12-22";

     

       8
       8
        
       in stdenv.mkDerivation rec {

     

       9
       9
        
         name = "${pname}-${version}";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "swaywm";

     

       13
       13
        
           repo = "wlroots";

     

       14
       14
       -
           rev = "7200d643363e988edf6777c38e7f8fcd451a2c50";

     

       15
       15
       -
           sha256 = "179raymkni1xzaph32zdhg7nfin0xfzrlnbnxkcr266k9y8k66ac";

     

       14
       14
       +
           rev = "0a370c529806077a11638e7fa856d5fbb539496b";

     

       15
       15
       +
           sha256 = "0h3i0psn5595dncv53l5m2mf13k9wcv3qi16vla5ckpskykc0xx6";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         # TODO: Temporary workaround for compilation errors

     

       19
       19
       -
         patches = [ ./libdrm.patch ./no-werror.patch ];

     

       19
       19
       +
         patches = [ ./libdrm.patch ]; #./no-werror.patch

     

       20
       20
       +
       

     

       21
       21
       +
         # $out for the library and $bin for rootston

     

       22
       22
       +
         outputs = [ "out" "bin" ];

     

       20
       23
        
       

     

       21
       24
        
         nativeBuildInputs = [ meson ninja pkgconfig ];

     

       22
       25
        
       

     

       23
       26
        
         buildInputs = [

     

       24
       27
        
           wayland mesa_noglu wayland-protocols libinput libxkbcommon pixman

     

       25
       25
       -
           xcbutilwm libX11 libcap

     

       28
       28
       +
           xcbutilwm libX11 libcap xcbutilimage

     

       26
       29
        
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         # Install rootston (the reference compositor) to $bin

     

       32
       32
       +
         postInstall = ''

     

       33
       33
       +
           mkdir -p $bin/bin

     

       34
       34
       +
           cp rootston/rootston $bin/bin/

     

       35
       35
       +
           mkdir $bin/lib

     

       36
       36
       +
           cp libwlroots.so $bin/lib/

     

       37
       37
       +
           patchelf --set-rpath "$bin/lib:${stdenv.lib.makeLibraryPath buildInputs}" $bin/bin/rootston

     

       38
       38
       +
         '';

     

       27
       39
        
       

     

       28
       40
        
         meta = with stdenv.lib; {

     

       29
       41
        
           description = "A modular Wayland compositor library";

pkgs/top-level/all-packages.nix

···

       15353
       15353
        
       

     

       15354
       15354
        
         wlc = callPackage ../development/libraries/wlc { };

     

       15355
       15355
        
         wlroots = callPackage ../development/libraries/wlroots { };

     

       15356
       15356
       +
         rootston = wlroots.bin;

     

       15356
       15357
        
         orbment = callPackage ../applications/window-managers/orbment { };

     

       15357
       15358
        
         sway = callPackage ../applications/window-managers/sway { };

     

       15358
       15359