commit e0c84a0256406c35c735348035582ae90bce91f8 · pyrox.dev/nixpkgs

+22 -13

pkgs/development/libraries/qmltermwidget/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp, fetchpatch }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , qtbase

     

       5
       5
       +
       , qtquick1

     

       6
       6
       +
       , qmake

     

       7
       7
       +
       , qtmultimedia

     

       8
       8
       +
       , utmp

     

       9
       9
       +
       }:

     

       2
       10
        
       

     

       3
       11
        
       stdenv.mkDerivation {

     

       4
       4
       -
         version = "2018-11-24";

     

       5
       5
       -
         pname = "qmltermwidget-unstable";

     

       12
       12
       +
         pname = "qmltermwidget";

     

       13
       13
       +
         version = "unstable-2022-01-09";

     

       6
       14
        
       

     

       7
       15
        
         src = fetchFromGitHub {

     

       8
       16
        
           repo = "qmltermwidget";

     

       9
       17
        
           owner = "Swordfish90";

     

       10
       10
       -
           rev = "48274c75660e28d44af7c195e79accdf1bd44963";

     

       11
       11
       -
           sha256 = "028nb1xp84jmakif5mmzx52q3rsjwckw27jdpahyaqw7j7i5znq6";

     

       18
       18
       +
           rev = "63228027e1f97c24abb907550b22ee91836929c5";

     

       19
       19
       +
           hash = "sha256-aVaiRpkYvuyomdkQYAgjIfi6a3wG2a6hNH1CfkA2WKQ=";

     

       12
       20
        
         };

     

       13
       21
        
       

     

       14
       14
       -
         buildInputs = [ qtbase qtquick1 qtmultimedia ]

     

       15
       15
       -
                       ++ lib.optional stdenv.isDarwin utmp;

     

       16
       22
        
         nativeBuildInputs = [ qmake ];

     

       17
       23
        
       

     

       24
       24
       +
         buildInputs = [

     

       25
       25
       +
           qtbase

     

       26
       26
       +
           qtquick1

     

       27
       27
       +
           qtmultimedia

     

       28
       28
       +
         ] ++ lib.optional stdenv.isDarwin utmp;

     

       29
       29
       +
       

     

       18
       30
        
         patches = [

     

       19
       19
       -
           (fetchpatch {

     

       20
       20
       -
             name = "fix-missing-includes.patch";

     

       21
       21
       -
             url = "https://github.com/Swordfish90/qmltermwidget/pull/27/commits/485f8d6d841b607ba49e55a791f7f587e4e193bc.diff";

     

       22
       22
       -
             sha256 = "186s8pv3642vr4lxsds919h0y2vrkl61r7wqq9mc4a5zk5vprinj";

     

       23
       23
       -
           })

     

       31
       31
       +
           # Some files are copied twice to the output which makes the build fails

     

       32
       32
       +
           ./do-not-copy-artifacts-twice.patch

     

       24
       33
        
         ];

     

       25
       34
        
       

     

       26
       35
        
         postPatch = ''

     
···

       28
       37
        
             --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/"

     

       29
       38
        
         '';

     

       30
       39
        
       

     

       31
       31
       -
         installFlags = [ "INSTALL_ROOT=$(out)" ];

     

       40
       40
       +
         installFlags = [ "INSTALL_ROOT=${placeholder "out"}" ];

     

       32
       41
        
       

     

       33
       42
        
         dontWrapQtApps = true;

     

       34
       43

+10

pkgs/development/libraries/qmltermwidget/do-not-copy-artifacts-twice.patch

···

       1
       1
       +
       diff --git a/qmltermwidget.pro b/qmltermwidget.pro

     

       2
       2
       +
       index c9594a9..aa1a804 100644

     

       3
       3
       +
       --- a/qmltermwidget.pro

     

       4
       4
       +
       +++ b/qmltermwidget.pro

     

       5
       5
       +
       @@ -62,4 +62,4 @@ kblayouts2.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH/kb-layouts/historic

     

       6
       6
       +
        scrollbar.files = $$PWD/src/QMLTermScrollbar.qml

     

       7
       7
       +
        scrollbar.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH

     

       8
       8
       +
        

     

       9
       9
       +
       -INSTALLS += target qmldir assets colorschemes colorschemes2 kblayouts kblayouts2 scrollbar

     

       10
       10
       +
       +INSTALLS += target qmldir assets