commit 134c5cc8dbf317584b2e53273e4bacd59e20b9f7 · pyrox.dev/nixpkgs

+29 -42

pkgs/applications/misc/termite/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, lib, pkgconfig, vte, gtk3, ncurses, makeWrapper, wrapGAppsHook, symlinkJoin

     

       2
       2
       -
       , configFile ? null

     

       3
       3
       -
       }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, pkgconfig, vte, gtk3, ncurses, wrapGAppsHook }:

     

       4
       2
        
       

     

       5
       5
       -
       let

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "termite-${version}";

     

       6
       5
        
         version = "13";

     

       7
       7
       -
         termite = stdenv.mkDerivation {

     

       8
       8
       -
           name = "termite-${version}";

     

       9
       6
        
       

     

       10
       10
       -
           src = fetchFromGitHub {

     

       11
       11
       -
             owner = "thestinger";

     

       12
       12
       -
             repo = "termite";

     

       13
       13
       -
             rev = "v${version}";

     

       14
       14
       -
             sha256 = "02cn70ygl93ghhkhs3xdxn5b1yadc255v3yp8cmhhyzsv5027hvj";

     

       15
       15
       -
             fetchSubmodules = true;

     

       16
       16
       -
           };

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "thestinger";

     

       9
       9
       +
           repo = "termite";

     

       10
       10
       +
           rev = "v${version}";

     

       11
       11
       +
           sha256 = "02cn70ygl93ghhkhs3xdxn5b1yadc255v3yp8cmhhyzsv5027hvj";

     

       12
       12
       +
           fetchSubmodules = true;

     

       13
       13
       +
         };

     

       17
       14
        
       

     

       18
       18
       -
           # https://github.com/thestinger/termite/pull/516

     

       19
       19
       -
           patches = [ ./url_regexp_trailing.patch ./add_errno_header.patch

     

       20
       20
       -
                       ] ++ lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch;

     

       15
       15
       +
         # https://github.com/thestinger/termite/pull/516

     

       16
       16
       +
         patches = [ ./url_regexp_trailing.patch ./add_errno_header.patch

     

       17
       17
       +
                     ] ++ stdenv.lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch;

     

       21
       18
        
       

     

       22
       22
       -
           makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];

     

       19
       19
       +
         makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];

     

       23
       20
        
       

     

       24
       24
       -
           buildInputs = [ vte gtk3 ncurses ];

     

       21
       21
       +
         buildInputs = [ vte gtk3 ncurses ];

     

       25
       22
        
       

     

       26
       26
       -
           nativeBuildInputs = [ wrapGAppsHook pkgconfig ];

     

       23
       23
       +
         nativeBuildInputs = [ wrapGAppsHook pkgconfig ];

     

       27
       24
        
       

     

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

     

       25
       25
       +
         outputs = [ "out" "terminfo" ];

     

       29
       26
        
       

     

       30
       30
       -
           postInstall = ''

     

       31
       31
       -
             mkdir -p $terminfo/share

     

       32
       32
       -
             mv $out/share/terminfo $terminfo/share/terminfo

     

       27
       27
       +
         postInstall = ''

     

       28
       28
       +
           mkdir -p $terminfo/share

     

       29
       29
       +
           mv $out/share/terminfo $terminfo/share/terminfo

     

       33
       30
        
       

     

       34
       34
       -
             mkdir -p $out/nix-support

     

       35
       35
       -
             echo "$terminfo" >> $out/nix-support/propagated-user-env-packages

     

       36
       36
       -
           '';

     

       31
       31
       +
           mkdir -p $out/nix-support

     

       32
       32
       +
           echo "$terminfo" >> $out/nix-support/propagated-user-env-packages

     

       33
       33
       +
         '';

     

       37
       34
        
       

     

       38
       38
       -
           meta = with stdenv.lib; {

     

       39
       39
       -
             description = "A simple VTE-based terminal";

     

       40
       40
       -
             license = licenses.lgpl2Plus;

     

       41
       41
       -
             homepage = https://github.com/thestinger/termite/;

     

       42
       42
       -
             maintainers = with maintainers; [ koral garbas ];

     

       43
       43
       -
             platforms = platforms.all;

     

       44
       44
       -
           };

     

       35
       35
       +
         meta = with stdenv.lib; {

     

       36
       36
       +
           description = "A simple VTE-based terminal";

     

       37
       37
       +
           license = licenses.lgpl2Plus;

     

       38
       38
       +
           homepage = https://github.com/thestinger/termite/;

     

       39
       39
       +
           maintainers = with maintainers; [ koral garbas ];

     

       40
       40
       +
           platforms = platforms.all;

     

       45
       41
        
         };

     

       46
       46
       -
       in if configFile == null then termite else symlinkJoin {

     

       47
       47
       -
         name = "termite-with-config-${version}";

     

       48
       48
       -
         paths = [ termite ];

     

       49
       49
       -
         nativeBuildInputs = [ makeWrapper ];

     

       50
       50
       -
         postBuild = ''

     

       51
       51
       -
           wrapProgram $out/bin/termite \

     

       52
       52
       -
             --add-flags "--config ${configFile}"

     

       53
       53
       -
         '';

     

       54
       54
       -
         passthru.terminfo = termite.terminfo;

     

       55
       42
        
       }

+15

pkgs/applications/misc/termite/wrapper.nix

···

       1
       1
       +
       {  makeWrapper, wrapGAppsHook, symlinkJoin, configFile ? null, termite }:

     

       2
       2
       +
       

     

       3
       3
       +
       if configFile == null then termite else symlinkJoin {

     

       4
       4
       +
         name = "termite-with-config-${termite.version}";

     

       5
       5
       +
       

     

       6
       6
       +
         paths = [ termite ];

     

       7
       7
       +
         nativeBuildInputs = [ makeWrapper ];

     

       8
       8
       +
       

     

       9
       9
       +
         postBuild = ''

     

       10
       10
       +
           wrapProgram $out/bin/termite \

     

       11
       11
       +
             --add-flags "--config ${configFile}"

     

       12
       12
       +
         '';

     

       13
       13
       +
       

     

       14
       14
       +
         passthru.terminfo = termite.terminfo;

     

       15
       15
       +
       }

+3 -1

pkgs/top-level/all-packages.nix

···

       18549
       18549
        
           vte = gnome3.vte;

     

       18550
       18550
        
         };

     

       18551
       18551
        
       

     

       18552
       18552
       -
         termite = callPackage ../applications/misc/termite {

     

       18552
       18552
       +
         termite-unwrapped = callPackage ../applications/misc/termite {

     

       18553
       18553
        
           vte = gnome3.vte-ng;

     

       18554
       18554
        
         };

     

       18555
       18555
       +
       

     

       18556
       18556
       +
         termite = callPackage ../applications/misc/termite/wrapper.nix { termite = termite-unwrapped; };

     

       18555
       18557
        
       

     

       18556
       18558
        
         termtosvg = callPackage ../tools/misc/termtosvg { };

     

       18557
       18559