1 files changed, 42 insertions, 38 deletions
diff --git a/pkgs/applications/version-management/gitqlient/default.nix b/pkgs/applications/version-management/gitqlient/default.nix
index a1c4ec5c694..622c0f04513 100644
--- a/pkgs/applications/version-management/gitqlient/default.nix
+++ b/pkgs/applications/version-management/gitqlient/default.nix
@@ -6,48 +6,52 @@
 , gitUpdater
 }:
 
-mkDerivation rec {
+let
   pname = "gitqlient";
   version = "1.5.0";
 
-  srcs = [
-    (fetchFromGitHub {
-      owner = "francescmm";
-      repo = pname;
-      rev = "v${version}";
-      sha256 = "sha256-Mq29HbmPABrRIJjWC5AAKIOKbGngeJdkZkWeJw8BFuw=";
-    })
-    (fetchFromGitHub rec {
-      owner = "francescmm";
-      repo = "AuxiliarCustomWidgets";
-      rev = "835f538b4a79e4d6bb70eef37a32103e7b2a1fd1";
-      sha256 = "sha256-b1gb/7UcLS6lI92dBfTenGXA064t4dZufs3S9lu/lQA=";
-      name = repo;
-    })
-    (fetchFromGitHub rec {
-      owner = "francescmm";
-      repo = "QLogger";
-      rev = "d1ed24e080521a239d5d5e2c2347fe211f0f3e4f";
-      sha256 = "sha256-NVlFYmm7IIkf8LhQrAYXil9kH6DFq1XjOEHQiIWmER4=";
-      name = repo;
-    })
-    (fetchFromGitHub rec {
-      owner = "francescmm";
-      repo = "QPinnableTabWidget";
-      rev = "cc937794e910d0452f0c07b4961c6014a7358831";
-      sha256 = "sha256-2KzzBv/s2t665axeBxWrn8aCMQQArQLlUBOAlVhU+wE=";
-      name = repo;
-    })
-    (fetchFromGitHub rec {
-      owner = "francescmm";
-      repo = "git";
-      rev = "b62750f4da4b133faff49e6f53950d659b18c948";
-      sha256 = "sha256-4FqA+kkHd0TqD6ZuB4CbJ+IhOtQG9uWN+qhSAT0dXGs=";
-      name = repo;
-    })
-  ];
+  main_src = fetchFromGitHub {
+    owner = "francescmm";
+    repo = pname;
+    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;
+  };
+  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 = "source";
+  sourceRoot = main_src.name;
 
   nativeBuildInputs = [
     qmake