commit 2ce9b9842b5e63884dfc3dea6689769e2a1ea309 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/x11/desktop-managers/phosh.nix

···

       173
       173
        
           systemd.services.phosh = {

     

       174
       174
        
             wantedBy = [ "graphical.target" ];

     

       175
       175
        
             serviceConfig = {

     

       176
       176
       -
               ExecStart = "${cfg.package}/bin/phosh";

     

       176
       176
       +
               ExecStart = "${cfg.package}/bin/phosh-session";

     

       177
       177
        
               User = cfg.user;

     

       178
       178
        
               Group = cfg.group;

     

       179
       179
        
               PAMName = "login";

+3 -2

pkgs/applications/misc/phoc/default.nix

···

       52
       52
        
         });

     

       53
       53
        
       in stdenv.mkDerivation rec {

     

       54
       54
        
         pname = "phoc";

     

       55
       55
       -
         version = "0.21.1";

     

       55
       55
       +
         version = "0.25.0";

     

       56
       56
        
       

     

       57
       57
        
         src = fetchFromGitLab {

     

       58
       58
        
           domain = "gitlab.gnome.org";

     
···

       60
       60
        
           owner = "Phosh";

     

       61
       61
        
           repo = pname;

     

       62
       62
        
           rev = "v${version}";

     

       63
       63
       -
           sha256 = "sha256-HPqhro6TE/Ukh4txBPrDoIuDaxSxd/ZkDVZU3+m3GFg=";

     

       63
       63
       +
           sha256 = "sha256-1cbv4vzQ+RcRoT1pOT8Q0nxuZzKUlec38KCNMYaceeE=";

     

       64
       64
       +
           fetchSubmodules = true;

     

       64
       65
        
         };

     

       65
       66
        
       

     

       66
       67
        
         nativeBuildInputs = [

+2 -7

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

···

       36
       36
        
       

     

       37
       37
        
       stdenv.mkDerivation rec {

     

       38
       38
        
         pname = "phosh";

     

       39
       39
       -
         version = "0.23.0";

     

       39
       39
       +
         version = "0.25.1";

     

       40
       40
        
       

     

       41
       41
        
         src = fetchFromGitLab {

     

       42
       42
        
           domain = "gitlab.gnome.org";

     
···

       45
       45
        
           repo = pname;

     

       46
       46
        
           rev = "v${version}";

     

       47
       47
        
           fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects

     

       48
       48
       -
           sha256 = "sha256-EMPqBKrtlwI9SJlqZjyAN5CtV4/BNwc5LapfeCEIYxc=";

     

       48
       48
       +
           sha256 = "sha256-ysAZdmkFEuqJDTPe246F2I4Qp+fjtomia42PS8BuMM8=";

     

       49
       49
        
         };

     

       50
       50
        
       

     

       51
       51
        
         nativeBuildInputs = [

     
···

       96
       96
        
           # https://github.com/NixOS/nixpkgs/issues/36468

     

       97
       97
        
           "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"

     

       98
       98
        
         ];

     

       99
       99
       -
       

     

       100
       100
       -
         postPatch = ''

     

       101
       101
       -
           chmod +x build-aux/post_install.py

     

       102
       102
       -
           patchShebangs build-aux/post_install.py

     

       103
       103
       -
         '';

     

       104
       99
        
       

     

       105
       100
        
         checkPhase = ''

     

       106
       101
        
           runHook preCheck