parent
1b5f7622b7
commit
6790312f30
|
@ -9,7 +9,7 @@ let
|
|||
];
|
||||
in
|
||||
rec {
|
||||
src = (a.fetchGitFromSrcInfo s) + "/";
|
||||
src = (a.fetchUrlFromSrcInfo s);
|
||||
inherit (s) name;
|
||||
|
||||
inherit buildInputs;
|
||||
|
@ -21,7 +21,7 @@ rec {
|
|||
setVars = a.noDepEntry (''
|
||||
'');
|
||||
|
||||
doWrap = a.makeManyWrappers "$out/bin/uzbl"
|
||||
doWrap = a.makeManyWrappers "$out/bin/uzbl-core"
|
||||
''
|
||||
--prefix GST_PLUGIN_PATH : ${a.webkit.gstreamer}/lib/gstreamer-* \
|
||||
--prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsBase}/lib/gstreamer-* \
|
||||
|
|
|
@ -1,38 +0,0 @@
|
|||
a :
|
||||
let
|
||||
s = import ./src-for-experimental.nix;
|
||||
buildInputs = with a; [
|
||||
libsoup pkgconfig webkit gtk makeWrapper
|
||||
];
|
||||
in
|
||||
rec {
|
||||
src = (a.fetchGitFromSrcInfo s) + "/";
|
||||
|
||||
inherit (s) name;
|
||||
inherit buildInputs;
|
||||
configureFlags = [];
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["setVars" "addInputs" "doMakeInstall" "doWrap"];
|
||||
|
||||
setVars = a.noDepEntry ''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"
|
||||
'';
|
||||
|
||||
doWrap = a.makeManyWrappers "$out/bin/uzbl*"
|
||||
''
|
||||
--prefix GST_PLUGIN_PATH : ${a.webkit.gstreamer}/lib/gstreamer-* \
|
||||
--prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsBase}/lib/gstreamer-* \
|
||||
--prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsGood}/lib/gstreamer-* \
|
||||
--prefix GST_PLUGIN_PATH : ${a.webkit.gstFfmpeg}/lib/gstreamer-*
|
||||
'';
|
||||
|
||||
installFlags = "PREFIX=$out";
|
||||
|
||||
meta = {
|
||||
description = "Tiny externally controllable webkit browser";
|
||||
maintainers = [a.lib.maintainers.raskin];
|
||||
platforms = with a.lib.platforms;
|
||||
linux;
|
||||
};
|
||||
}
|
|
@ -1,9 +1,10 @@
|
|||
rec {
|
||||
version="d2d73ad463f3d9f1c673d37457af159947b3faac";
|
||||
name="uzbl-stable-d2d73ad463f3d9f1c673d37457af159947b3faac";
|
||||
hash="7b162ad46445b4080c0cf2ac57c777186d4a9a58979499fe5556e6e855d4e53c";
|
||||
rev="d2d73ad463f3d9f1c673d37457af159947b3faac";
|
||||
url="git://github.com/Dieterbe/uzbl.git";
|
||||
version="2010.04.03";
|
||||
name="uzbl-stable-2010.04.03";
|
||||
hash="1jxs9agk4jd09v73vl69k3mil4jfr5rhfb0v4sq8sfh1p8nl389s";
|
||||
url="http://github.com/Dieterbe/uzbl/tarball/${version}";
|
||||
advertisedUrl="http://github.com/Dieterbe/uzbl/tarball/2010.04.03";
|
||||
|
||||
downloadName="2010.04.03.tar.gz";
|
||||
|
||||
}
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
rec {
|
||||
version="1461ac760f79b8f153c8317c4534cb047a48331a";
|
||||
name="uzbl-experimental-1461ac760f79b8f153c8317c4534cb047a48331a";
|
||||
hash="b5dfae5245b1b3934ca918831fbe9fa0bb7ae790c682b69f5ecc042cccf58894";
|
||||
rev="1461ac760f79b8f153c8317c4534cb047a48331a";
|
||||
url="git://github.com/Dieterbe/uzbl.git";
|
||||
}
|
|
@ -1,7 +1,9 @@
|
|||
{
|
||||
repoUrl = "git://github.com/Dieterbe/uzbl.git";
|
||||
baseName = "uzbl-stable";
|
||||
method = "fetchgit";
|
||||
rev = "origin/master";
|
||||
downloadPage = "http://github.com/Dieterbe/uzbl/downloads";
|
||||
sourceRegexp = "/tarball/";
|
||||
versionExtractorSedScript = ''s@.*[/]@@'';
|
||||
versionReferenceCreator = ''$(replaceAllVersionOccurences)'';
|
||||
extraVars = "downloadName";
|
||||
eval_downloadName = ''downloadName=$version.tar.gz'';
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
repoUrl = "git://github.com/Dieterbe/uzbl.git";
|
||||
baseName = "uzbl-experimental";
|
||||
method = "fetchgit";
|
||||
rev = "origin/experimental";
|
||||
}
|
Loading…
Reference in New Issue