diff options
author | Domen Kožar <domen@dev.si> | 2014-01-06 22:35:39 +0000 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2014-02-20 01:19:15 +0100 |
commit | fae6079a01b604cdaaab2ecb9bf48368be31255e (patch) | |
tree | 3a7050a583b9cad68653f4c4066afbdbae5767f9 /pkgs/tools/admin/gtk-vnc | |
parent | 6adfd13dd4b28546e4ea0dfa4e28727b94c891e9 (diff) | |
download | nixpkgs-fae6079a01b604cdaaab2ecb9bf48368be31255e.tar nixpkgs-fae6079a01b604cdaaab2ecb9bf48368be31255e.tar.gz nixpkgs-fae6079a01b604cdaaab2ecb9bf48368be31255e.tar.bz2 nixpkgs-fae6079a01b604cdaaab2ecb9bf48368be31255e.tar.lz nixpkgs-fae6079a01b604cdaaab2ecb9bf48368be31255e.tar.xz nixpkgs-fae6079a01b604cdaaab2ecb9bf48368be31255e.tar.zst nixpkgs-fae6079a01b604cdaaab2ecb9bf48368be31255e.zip |
adopt rest of the packages that were failing with the buildPythonPackage changes
Diffstat (limited to 'pkgs/tools/admin/gtk-vnc')
-rw-r--r-- | pkgs/tools/admin/gtk-vnc/default.nix | 71 |
1 files changed, 25 insertions, 46 deletions
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 44a421e2ba3..d4c45b7ba96 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,62 +1,41 @@ -x@{builderDefsPackage - , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 - , libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs - , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["perlPackages" "firefoxPkgs"]; - - buildInputs = (map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames))) - ++ [perlPackages.TextCSV firefoxPkgs.xulrunner ]; - sourceInfo = rec { - baseName="gtk-vnc"; - majorVersion="0.4"; - minorVersion="2"; - version="${majorVersion}.${minorVersion}"; - name="${baseName}-${version}"; - url="mirror://gnome/sources/${baseName}/${majorVersion}/${name}.tar.gz"; - hash="1fkhzwpw50rnwp51lsbny16p2ckzx5rkcaiaqvkd90vwnm2cccls"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +{ stdenv, fetchurl +, python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 +, libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs, pulseaudio +, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt }: + + +stdenv.mkDerivation rec { + name = "gtk-vnc-${version}"; + version = "0.5.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gtk-vnc/0.5/${name}.tar.xz"; + sha256 = "1bww2ihxb3zzvifdrcsy1lifr664pvikq17hmr1hsm8fyk4ad46l"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + buildInputs = [ + python gtk pygtk gnutls cairo libtool pkgconfig glib libffi libgcrypt + intltool cyrus_sasl pulseaudio pygobject perl perlPackages.TextCSV + ]; + NIX_CFLAGS_COMPILE = "-fstack-protector-all"; configureFlags = [ "--with-python" "--with-examples" ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["fixMakefiles" "doConfigure" "doMakeInstall"]; + makeFlags = "CODEGENDIR=${pygobject}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/"; - fixMakefiles = a.fullDepEntry '' - find . -name 'Makefile*' -exec sed -i '{}' -e 's@=codegendir pygtk-2.0@=codegendir pygobject-2.0@' ';' - '' ["minInit" "doUnpack"]; - - meta = { + meta = with stdenv.lib; { description = "A GTK VNC widget"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.lgpl21; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; + license = licenses.lgpl21; }; + passthru = { updateInfo = { downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/gtk-vnc"; }; }; -}) x - +} |