2 files changed, 9 insertions, 18 deletions

diff --git a/pkgs/webapps/mediagoblin/default.nix b/pkgs/webapps/mediagoblin/default.nix
index d348ce1..29c1981 100644
--- a/pkgs/webapps/mediagoblin/default.nix
+++ b/pkgs/webapps/mediagoblin/default.nix
@@ -1,4 +1,4 @@
-{ makeWrapper, stdenv, writeScript, fetchurl, buildBowerComponents, mylibs, which, python36, gst_all_1, automake, autoconf, nodejs, nodePackages, lib, callPackage }:
+{ makeWrapper, stdenv, writeScript, fetchurl, buildBowerComponents, mylibs, which, python36, gst_all_1, automake, autoconf, nodejs, nodePackages, lib, callPackage, sources }:
 let
   overridePython = let
     packageOverrides = self: super: {
@@ -108,10 +108,11 @@ let
             load_entry_point('mediagoblin', 'console_scripts', 'gmg')()
         )
     '';
+  mediagoblinSrc = sources.webapps-mediagoblin;
   bowerComponents = buildBowerComponents {
     name = "mediagoblin-bower-components";
     generated = ./bower-packages.nix;
-    src = (mylibs.fetchedGit ./mediagoblin.json).src;
+    src = mediagoblinSrc;
   };
   pluginNames = [ "basicsearch" ];
   allPlugins = lib.attrsets.genAttrs pluginNames
@@ -129,7 +130,11 @@ let
         passthru = toPassthru newMediagoblin;
       });
     in newMediagoblin;
-  package = stdenv.mkDerivation (mylibs.fetchedGit ./mediagoblin.json // rec {
+  package = stdenv.mkDerivation rec {
+    pname = "mediagoblin";
+    name = "${pname}-${version}";
+    version = mediagoblinSrc.version;
+    src = mediagoblinSrc;
     preConfigure = ''
       # ./bootstrap.sh
       aclocal -I m4 --install
@@ -178,5 +183,5 @@ let
     buildInputs = [ makeWrapper automake autoconf which nodePackages.bower nodejs python ];
     propagatedBuildInputs = with gst_all_1; [ python gst-libav gst-plugins-good gst-plugins-bad gst-plugins-ugly gstreamer ];
     passthru = toPassthru package;
-  });
+  };
 in package
diff --git a/pkgs/webapps/mediagoblin/mediagoblin.json b/pkgs/webapps/mediagoblin/mediagoblin.json
deleted file mode 100644
index 7ea72d1..0000000
--- a/pkgs/webapps/mediagoblin/mediagoblin.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "tag": "cd465eb-stable",
-  "meta": {
-    "name": "mediagoblin",
-    "url": "git://git.savannah.gnu.org/mediagoblin.git",
-    "branch": "stable"
-  },
-  "git": {
-    "url": "git://git.savannah.gnu.org/mediagoblin.git",
-    "rev": "cd465ebfec837a75a44c4ebd727dffe2fff6d850",
-    "sha256": "1yz4i4i97z3rxl534a6psaybyjbyp5nnc52v3nvbpzc4pd2s69mx",
-    "fetchSubmodules": true
-  }
-}