diff options
Diffstat (limited to 'pkgs/applications')
7 files changed, 45 insertions, 50 deletions
diff --git a/pkgs/applications/misc/xlsfonts/default.nix b/pkgs/applications/misc/xlsfonts/default.nix deleted file mode 100644 index 7584ebf72fb..00000000000 --- a/pkgs/applications/misc/xlsfonts/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This program used to come with xorg releases, but now I could only find it -# at http://www.x.org/releases/individual/. -# That is why this expression is not inside pkgs.xorg - -{stdenv, fetchurl, libX11, pkgconfig}: -stdenv.mkDerivation rec { - name = "xlsfonts-1.0.4"; - - src = fetchurl { - url = "mirror://xorg/individual/app/${name}.tar.bz2"; - sha256 = "1lhcx600z9v65nk93xaxfzi79bm4naynabb52gz1vy1bxj2r25r8"; - }; - - buildInputs = [libX11 pkgconfig]; - - meta = { - homepage = http://www.x.org/; - description = "Lists the fonts available in the X server"; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux ++ darwin; - }; -} diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index a212ab5347c..524433b45fb 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -62,7 +62,6 @@ stdenv.mkDerivation rec { --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \ --prefix "HOME" : "$out/share/panamax-api" \ --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \ - --prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/etc/ssl/certs/ca-bundle.crt" \ --prefix "SSL_CERT_FILE" : "${cacert}/etc/ssl/certs/ca-bundle.crt" \ --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}" ''; diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index 2b3703bc279..d0cc333c71b 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -43,7 +43,7 @@ in mkTkabber (main // { postPatch = '' substituteInPlace login.tcl --replace \ "custom::defvar loginconf(sslcacertstore) \"\"" \ - "custom::defvar loginconf(sslcacertstore) \$env(OPENSSL_X509_CERT_FILE)" + "custom::defvar loginconf(sslcacertstore) \$env(SSL_CERT_FILE)" '' + optionalString (theme != null) '' themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb" sed -i '/^if.*load_default_xrdb/,/^}$/ { diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 28baa2f7b67..c2ee5cd83db 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { ]; preFixup = '' - rm $out/share/icons/hicolor/icon-theme.cache - for f in "$out"/bin/*; do wrapProgram "$f" \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ diff --git a/pkgs/applications/version-management/git-and-tools/git/cert-path.patch b/pkgs/applications/version-management/git-and-tools/git/cert-path.patch index 846752f5bfe..7d5dca9abfe 100644 --- a/pkgs/applications/version-management/git-and-tools/git/cert-path.patch +++ b/pkgs/applications/version-management/git-and-tools/git/cert-path.patch @@ -5,7 +5,7 @@ diff -ru -x '*~' git-1.9.2-orig/git-send-email.perl git-1.9.2/git-send-email.per return; } -+ $smtp_ssl_cert_path //= $ENV{'OPENSSL_X509_CERT_FILE'}; ++ $smtp_ssl_cert_path //= $ENV{'SSL_CERT_FILE'}; + if (!defined $smtp_ssl_cert_path) { # use the OpenSSL defaults diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix new file mode 100644 index 00000000000..b9c4de0811d --- /dev/null +++ b/pkgs/applications/video/minitube/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon_backend_vlc, qt4 +# "Free" API key generated by nckx <tobias.geerinckx.rice@gmail.com> +, withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: + +let version = "2.4"; in +stdenv.mkDerivation { + name = "minitube-${version}"; + + src = fetchFromGitHub { + sha256 = "0mm8v2vpspwxh2fqaykb381v6r9apywc1b0x8jkcbp7s43w10lp5"; + rev = version; + repo = "minitube"; + owner = "flaviotordini"; + }; + + meta = with stdenv.lib; { + inherit version; + description = "Stand-alone YouTube video player"; + longDescription = '' + Watch YouTube videos in a new way: you type a keyword, Minitube gives + you an endless video stream. Minitube is not about cloning the YouTube + website, it aims to create a new TV-like experience. + ''; + homepage = http://flavio.tordini.org/minitube; + license = licenses.gpl3Plus; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ phonon phonon_backend_vlc qt4 ]; + nativeBuildInputs = [ makeWrapper ]; + + configurePhase = '' + qmake PREFIX=$out "DEFINES += APP_GOOGLE_API_KEY=${withAPIKey}" + ''; + + enableParallelBuilding = true; + + postInstall = '' + wrapProgram $out/bin/minitube \ + --prefix QT_PLUGIN_PATH : "${phonon_backend_vlc}/lib/kde4/plugins" + ''; +} diff --git a/pkgs/applications/window-managers/xcompmgr/default.nix b/pkgs/applications/window-managers/xcompmgr/default.nix deleted file mode 100644 index 930b612f691..00000000000 --- a/pkgs/applications/window-managers/xcompmgr/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libXcomposite, libXfixes, libXdamage -, libXrender, libXext }: -stdenv.mkDerivation rec { - name = "xcompmgr-1.1.6"; - src = fetchurl { - url = "mirror://xorg/individual/app/${name}.tar.bz2"; - sha256 = "c98949d36793b30ed1ed47495c87a05fa245ac0fc2857d2abc54979124687c02"; - }; - buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender libXext ]; - meta = { - homepage = http://www.x.org/; - description = "A sample compositing manager for X servers"; - longDescription = '' - A sample compositing manager for X servers supporting the XFIXES, - DAMAGE, RENDER, and COMPOSITE extensions. It enables basic eye-candy - effects. - ''; - license = "bsd"; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; - }; -} |