pkgs: Use callPackageScope wherever applicable

This should remove a lot of clutter from pkgs/default.nix into
corresponding sub-scopes, eg. pkgs/openlab/default.nix.

Apart from restructuring there is no change of runtime functionality
involved.

Tested by evaluating with "nix-env -f pkgs -qaP".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @Profpatsch, @sternenseemann

1 files changed, 35 insertions, 0 deletions

diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix
new file mode 100644
index 00000000..d5b57628
--- /dev/null
+++ b/pkgs/profpatsch/default.nix
@@ -0,0 +1,35 @@
+{ callPackage, haskellPackages, jmtpfs, libmtp, droopy, fetchFromGitHub }:
+
+{
+  display-infos = callPackage ./display-infos {};
+  nman = callPackage ./nman {};
+  warpspeed = callPackage ./warpspeed {
+    inherit (haskellPackages) ghcWithPackages;
+  };
+
+  jmtpfs = jmtpfs.override {
+    libmtp = libmtp.overrideDerivation (old: {
+      patches = old.patches or [] ++ [
+        ./patches/mtp-jolla.patch
+      ];
+    });
+  };
+
+  # patched version of droopy, with javascript user-enhancement
+  droopy = droopy.overrideDerivation (old: {
+    src = fetchFromGitHub {
+      owner = "Profpatsch";
+      repo = "Droopy";
+      rev = "dc63d0ac9cecd74cdff84ab9ea2a5849d6953e8a";
+      sha256 = "09sms524wrnpdkhnpv9f2qbq30s8h02ljiv934g0dvmxy8571ph7";
+    };
+    installPhase = old.installPhase or "" + ''
+      mkdir -p $out/share/droopy
+      cp -r $src/static $out/share/droopy
+    '';
+    makeWrapperArgs = old.makeWrapperArgs or [] ++ [
+      "--set DROOPY_STATIC \"$out/share/droopy/static\""
+    ];
+
+  });
+}