diff options
| author | Gaetan Lepage <gaetan@glepage.com> | 2023-07-20 16:57:47 +0200 |
|---|---|---|
| committer | Gaetan Lepage <gaetan@glepage.com> | 2023-07-21 15:07:20 +0200 |
| commit | e0c84a0256406c35c735348035582ae90bce91f8 (patch) | |
| tree | f21ff22e5f3b1b0a5a5bb3c1575b9d0f1f21c909 /pkgs/development/libraries | |
| parent | dbf6c323883ae7e00941f628e65bdd58b3660e9a (diff) | |
| download | nixpkgs-e0c84a0256406c35c735348035582ae90bce91f8.tar nixpkgs-e0c84a0256406c35c735348035582ae90bce91f8.tar.gz nixpkgs-e0c84a0256406c35c735348035582ae90bce91f8.tar.bz2 nixpkgs-e0c84a0256406c35c735348035582ae90bce91f8.tar.lz nixpkgs-e0c84a0256406c35c735348035582ae90bce91f8.tar.xz nixpkgs-e0c84a0256406c35c735348035582ae90bce91f8.tar.zst nixpkgs-e0c84a0256406c35c735348035582ae90bce91f8.zip | |
qmltermwidget: 2018-11-24 -> unstable-2022-01-09
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/qmltermwidget/default.nix | 35 | ||||
| -rw-r--r-- | pkgs/development/libraries/qmltermwidget/do-not-copy-artifacts-twice.patch | 10 |
2 files changed, 32 insertions, 13 deletions
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index bd6ebbd8e37..378b6babd72 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,26 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, qtbase +, qtquick1 +, qmake +, qtmultimedia +, utmp +}: stdenv.mkDerivation { - version = "2018-11-24"; - pname = "qmltermwidget-unstable"; + pname = "qmltermwidget"; + version = "unstable-2022-01-09"; src = fetchFromGitHub { repo = "qmltermwidget"; owner = "Swordfish90"; - rev = "48274c75660e28d44af7c195e79accdf1bd44963"; - sha256 = "028nb1xp84jmakif5mmzx52q3rsjwckw27jdpahyaqw7j7i5znq6"; + rev = "63228027e1f97c24abb907550b22ee91836929c5"; + hash = "sha256-aVaiRpkYvuyomdkQYAgjIfi6a3wG2a6hNH1CfkA2WKQ="; }; - buildInputs = [ qtbase qtquick1 qtmultimedia ] - ++ lib.optional stdenv.isDarwin utmp; nativeBuildInputs = [ qmake ]; + buildInputs = [ + qtbase + qtquick1 + qtmultimedia + ] ++ lib.optional stdenv.isDarwin utmp; + patches = [ - (fetchpatch { - name = "fix-missing-includes.patch"; - url = "https://github.com/Swordfish90/qmltermwidget/pull/27/commits/485f8d6d841b607ba49e55a791f7f587e4e193bc.diff"; - sha256 = "186s8pv3642vr4lxsds919h0y2vrkl61r7wqq9mc4a5zk5vprinj"; - }) + # Some files are copied twice to the output which makes the build fails + ./do-not-copy-artifacts-twice.patch ]; postPatch = '' @@ -28,7 +37,7 @@ stdenv.mkDerivation { --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/" ''; - installFlags = [ "INSTALL_ROOT=$(out)" ]; + installFlags = [ "INSTALL_ROOT=${placeholder "out"}" ]; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/qmltermwidget/do-not-copy-artifacts-twice.patch b/pkgs/development/libraries/qmltermwidget/do-not-copy-artifacts-twice.patch new file mode 100644 index 00000000000..a10c4b16055 --- /dev/null +++ b/pkgs/development/libraries/qmltermwidget/do-not-copy-artifacts-twice.patch @@ -0,0 +1,10 @@ +diff --git a/qmltermwidget.pro b/qmltermwidget.pro +index c9594a9..aa1a804 100644 +--- a/qmltermwidget.pro ++++ b/qmltermwidget.pro +@@ -62,4 +62,4 @@ kblayouts2.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH/kb-layouts/historic + scrollbar.files = $$PWD/src/QMLTermScrollbar.qml + scrollbar.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH + +-INSTALLS += target qmldir assets colorschemes colorschemes2 kblayouts kblayouts2 scrollbar ++INSTALLS += target qmldir assets |