aboutsummaryrefslogtreecommitdiff
path: root/pkgs/webapps/mediagoblin
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/webapps/mediagoblin')
-rw-r--r--pkgs/webapps/mediagoblin/default.nix13
-rw-r--r--pkgs/webapps/mediagoblin/mediagoblin.json14
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 @@
1{ makeWrapper, stdenv, writeScript, fetchurl, buildBowerComponents, mylibs, which, python36, gst_all_1, automake, autoconf, nodejs, nodePackages, lib, callPackage }: 1{ makeWrapper, stdenv, writeScript, fetchurl, buildBowerComponents, mylibs, which, python36, gst_all_1, automake, autoconf, nodejs, nodePackages, lib, callPackage, sources }:
2let 2let
3 overridePython = let 3 overridePython = let
4 packageOverrides = self: super: { 4 packageOverrides = self: super: {
@@ -108,10 +108,11 @@ let
108 load_entry_point('mediagoblin', 'console_scripts', 'gmg')() 108 load_entry_point('mediagoblin', 'console_scripts', 'gmg')()
109 ) 109 )
110 ''; 110 '';
111 mediagoblinSrc = sources.webapps-mediagoblin;
111 bowerComponents = buildBowerComponents { 112 bowerComponents = buildBowerComponents {
112 name = "mediagoblin-bower-components"; 113 name = "mediagoblin-bower-components";
113 generated = ./bower-packages.nix; 114 generated = ./bower-packages.nix;
114 src = (mylibs.fetchedGit ./mediagoblin.json).src; 115 src = mediagoblinSrc;
115 }; 116 };
116 pluginNames = [ "basicsearch" ]; 117 pluginNames = [ "basicsearch" ];
117 allPlugins = lib.attrsets.genAttrs pluginNames 118 allPlugins = lib.attrsets.genAttrs pluginNames
@@ -129,7 +130,11 @@ let
129 passthru = toPassthru newMediagoblin; 130 passthru = toPassthru newMediagoblin;
130 }); 131 });
131 in newMediagoblin; 132 in newMediagoblin;
132 package = stdenv.mkDerivation (mylibs.fetchedGit ./mediagoblin.json // rec { 133 package = stdenv.mkDerivation rec {
134 pname = "mediagoblin";
135 name = "${pname}-${version}";
136 version = mediagoblinSrc.version;
137 src = mediagoblinSrc;
133 preConfigure = '' 138 preConfigure = ''
134 # ./bootstrap.sh 139 # ./bootstrap.sh
135 aclocal -I m4 --install 140 aclocal -I m4 --install
@@ -178,5 +183,5 @@ let
178 buildInputs = [ makeWrapper automake autoconf which nodePackages.bower nodejs python ]; 183 buildInputs = [ makeWrapper automake autoconf which nodePackages.bower nodejs python ];
179 propagatedBuildInputs = with gst_all_1; [ python gst-libav gst-plugins-good gst-plugins-bad gst-plugins-ugly gstreamer ]; 184 propagatedBuildInputs = with gst_all_1; [ python gst-libav gst-plugins-good gst-plugins-bad gst-plugins-ugly gstreamer ];
180 passthru = toPassthru package; 185 passthru = toPassthru package;
181 }); 186 };
182in package 187in 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 @@
1{
2 "tag": "cd465eb-stable",
3 "meta": {
4 "name": "mediagoblin",
5 "url": "git://git.savannah.gnu.org/mediagoblin.git",
6 "branch": "stable"
7 },
8 "git": {
9 "url": "git://git.savannah.gnu.org/mediagoblin.git",
10 "rev": "cd465ebfec837a75a44c4ebd727dffe2fff6d850",
11 "sha256": "1yz4i4i97z3rxl534a6psaybyjbyp5nnc52v3nvbpzc4pd2s69mx",
12 "fetchSubmodules": true
13 }
14}