commit e66af6ccbe7a01e146316818896e4cffd5f11568 · pyrox.dev/nixpkgs

+13 -22

pkgs/applications/networking/instant-messengers/cinny/default.nix pkgs/by-name/ci/cinny-unwrapped/package.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , buildNpmPackage

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , writeText

     

       5
       5
       -
       , jq

     

       6
       6
       -
       , python3

     

       7
       7
       -
       , pkg-config

     

       8
       8
       -
       , pixman

     

       9
       9
       -
       , cairo

     

       10
       10
       -
       , pango

     

       11
       11
       -
       , stdenv

     

       12
       12
       -
       , darwin

     

       13
       13
       -
       , conf ? { }

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildNpmPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         python3,

     

       6
       6
       +
         pkg-config,

     

       7
       7
       +
         pixman,

     

       8
       8
       +
         cairo,

     

       9
       9
       +
         pango,

     

       10
       10
       +
         stdenv,

     

       11
       11
       +
         darwin,

     

       14
       12
        
       }:

     

       15
       13
        
       

     

       16
       16
       -
       let

     

       17
       17
       -
         configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);

     

       18
       18
       -
       in

     

       19
       14
        
       buildNpmPackage rec {

     

       20
       20
       -
         pname = "cinny";

     

       15
       15
       +
         pname = "cinny-unwrapped";

     

       21
       16
        
         version = "4.0.3";

     

       22
       17
        
       

     

       23
       18
        
         src = fetchFromGitHub {

     
···

       35
       30
        
         ) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1";

     

       36
       31
        
       

     

       37
       32
        
         nativeBuildInputs = [

     

       38
       38
       -
           jq

     

       39
       33
        
           python3

     

       40
       34
        
           pkg-config

     

       41
       35
        
         ];

     
···

       44
       38
        
           pixman

     

       45
       39
        
           cairo

     

       46
       40
        
           pango

     

       47
       47
       -
         ] ++ lib.optionals stdenv.isDarwin [

     

       48
       48
       -
           darwin.apple_sdk.frameworks.CoreText

     

       49
       49
       -
         ];

     

       41
       41
       +
         ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreText ];

     

       50
       42
        
       

     

       51
       43
        
         installPhase = ''

     

       52
       44
        
           runHook preInstall

     

       53
       45
        
       

     

       54
       46
        
           cp -r dist $out

     

       55
       55
       -
           jq -s '.[0] * .[1]' "config.json" "${configOverrides}" > "$out/config.json"

     

       56
       47
        
       

     

       57
       48
        
           runHook postInstall

     

       58
       49
        
         '';

+32

pkgs/by-name/ci/cinny/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         cinny-unwrapped,

     

       3
       3
       +
         jq,

     

       4
       4
       +
         stdenvNoCC,

     

       5
       5
       +
         writeText,

     

       6
       6
       +
         conf ? { },

     

       7
       7
       +
       }:

     

       8
       8
       +
       let

     

       9
       9
       +
         configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);

     

       10
       10
       +
       in

     

       11
       11
       +
       if (conf == { }) then

     

       12
       12
       +
         cinny-unwrapped

     

       13
       13
       +
       else

     

       14
       14
       +
         stdenvNoCC.mkDerivation {

     

       15
       15
       +
           pname = "cinny";

     

       16
       16
       +
           inherit (cinny-unwrapped) version meta;

     

       17
       17
       +
       

     

       18
       18
       +
           dontUnpack = true;

     

       19
       19
       +
       

     

       20
       20
       +
           nativeBuildInputs = [ jq ];

     

       21
       21
       +
       

     

       22
       22
       +
           installPhase = ''

     

       23
       23
       +
             runHook preInstall

     

       24
       24
       +
       

     

       25
       25
       +
             mkdir -p $out

     

       26
       26
       +
             ln -s ${cinny-unwrapped}/* $out

     

       27
       27
       +
             rm $out/config.json

     

       28
       28
       +
             jq -s '.[0] * .[1]' "${cinny-unwrapped}/config.json" "${configOverrides}" > "$out/config.json"

     

       29
       29
       +
       

     

       30
       30
       +
             runHook postInstall

     

       31
       31
       +
           '';

     

       32
       32
       +
         }

-2

pkgs/top-level/all-packages.nix

···

       4484
       4484
        
       

     

       4485
       4485
        
         cht-sh = callPackage ../tools/misc/cht.sh { };

     

       4486
       4486
        
       

     

       4487
       4487
       -
         cinny = callPackage ../applications/networking/instant-messengers/cinny { };

     

       4488
       4488
       -
       

     

       4489
       4487
        
         cinny-desktop = callPackage ../applications/networking/instant-messengers/cinny-desktop { };

     

       4490
       4488
        
       

     

       4491
       4489
        
         ckbcomp = callPackage ../tools/X11/ckbcomp { };