diff options
author | José Romildo <malaquias@gmail.com> | 2024-01-23 16:29:37 -0300 |
---|---|---|
committer | José Romildo <malaquias@gmail.com> | 2024-01-23 16:31:36 -0300 |
commit | 00679f46fbd90c6e46412551c7739dcdeb7c8ba1 (patch) | |
tree | f1e52799f8d97a79f53c74a3d0d8e9eac0d95968 | |
parent | 0dce022fbf9073508714e91b28fce1762d7ba9da (diff) | |
download | nixlib-00679f46fbd90c6e46412551c7739dcdeb7c8ba1.tar nixlib-00679f46fbd90c6e46412551c7739dcdeb7c8ba1.tar.gz nixlib-00679f46fbd90c6e46412551c7739dcdeb7c8ba1.tar.bz2 nixlib-00679f46fbd90c6e46412551c7739dcdeb7c8ba1.tar.lz nixlib-00679f46fbd90c6e46412551c7739dcdeb7c8ba1.tar.xz nixlib-00679f46fbd90c6e46412551c7739dcdeb7c8ba1.tar.zst nixlib-00679f46fbd90c6e46412551c7739dcdeb7c8ba1.zip |
gitqlient: refactor to fetch submodules
-rw-r--r-- | pkgs/applications/version-management/gitqlient/default.nix | 52 |
1 files changed, 5 insertions, 47 deletions
diff --git a/pkgs/applications/version-management/gitqlient/default.nix b/pkgs/applications/version-management/gitqlient/default.nix index 2c1ccb76dd73..2a24608a938d 100644 --- a/pkgs/applications/version-management/gitqlient/default.nix +++ b/pkgs/applications/version-management/gitqlient/default.nix @@ -6,52 +6,17 @@ , gitUpdater }: -let +mkDerivation rec { pname = "gitqlient"; version = "1.5.0"; - main_src = fetchFromGitHub { + src = fetchFromGitHub { owner = "francescmm"; - repo = pname; + repo = "gitqlient"; rev = "v${version}"; - sha256 = "sha256-Mq29HbmPABrRIJjWC5AAKIOKbGngeJdkZkWeJw8BFuw="; - }; - aux_src = fetchFromGitHub rec { - owner = "francescmm"; - repo = "AuxiliarCustomWidgets"; - rev = "835f538b4a79e4d6bb70eef37a32103e7b2a1fd1"; - sha256 = "sha256-b1gb/7UcLS6lI92dBfTenGXA064t4dZufs3S9lu/lQA="; - name = repo; - }; - qlogger_src = fetchFromGitHub rec { - owner = "francescmm"; - repo = "QLogger"; - rev = "d1ed24e080521a239d5d5e2c2347fe211f0f3e4f"; - sha256 = "sha256-NVlFYmm7IIkf8LhQrAYXil9kH6DFq1XjOEHQiIWmER4="; - name = repo; - }; - qpinnabletab_src = fetchFromGitHub rec { - owner = "francescmm"; - repo = "QPinnableTabWidget"; - rev = "cc937794e910d0452f0c07b4961c6014a7358831"; - sha256 = "sha256-2KzzBv/s2t665axeBxWrn8aCMQQArQLlUBOAlVhU+wE="; - name = repo; + fetchSubmodules = true; + hash = "sha256-KUuJiuktiPi++W7QpccLqswFh5HaKmtf1WkXQGqWAH4="; }; - git_src = fetchFromGitHub rec { - owner = "francescmm"; - repo = "git"; - rev = "b62750f4da4b133faff49e6f53950d659b18c948"; - sha256 = "sha256-4FqA+kkHd0TqD6ZuB4CbJ+IhOtQG9uWN+qhSAT0dXGs="; - name = repo; - }; -in - -mkDerivation rec { - inherit pname version; - - srcs = [ main_src aux_src qlogger_src qpinnabletab_src git_src ]; - - sourceRoot = main_src.name; nativeBuildInputs = [ qmake @@ -61,13 +26,6 @@ mkDerivation rec { qtwebengine ]; - postUnpack = '' - for dep in AuxiliarCustomWidgets QPinnableTabWidget QLogger git; do - rmdir "${main_src.name}/src/$dep" - ln -sf "../../$dep" "${main_src.name}/src/$dep" - done - ''; - qmakeFlags = [ "GitQlient.pro" ]; |