diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index e37d1c6f11ff..4654d5902cb0 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -1,42 +1,28 @@ -a @ {imake, libX11, xproto, gccmakedep, libXt -, libXmu, libXaw, libXext, xextproto, libSM, libICE, libXpm -, libXp, ...} : -let - fetchurl = a.fetchurl; +{ stdenv, fetchurl, libX11, xproto, imake, gccmakedep, libXt, libXmu +, libXaw, libXext, xextproto, libSM, libICE, libXpm, libXp +}: + +stdenv.mkDerivation rec { + name = "vncrec-0.2"; # version taken from Arch AUR - buildInputs = with a; [ - libX11 xproto imake gccmakedep libXt libXmu libXaw - libXext xextproto libSM libICE libXpm libXp - ]; -in -rec { src = fetchurl { url = "http://ronja.twibright.com/utils/vncrec-twibright.tgz"; sha256 = "1yp6r55fqpdhc8cgrgh9i0mzxmkls16pgf8vfcpng1axr7cigyhc"; }; - inherit buildInputs; - makeFlags = [ - "World" - ]; - installFlags=[ - "BINDIR=/bin/" - "MANDIR=/share/man/man1" - "DESTDIR=$out" - "install.man" - ]; + buildInputs = [ + libX11 xproto imake gccmakedep libXt libXmu libXaw + libXext xextproto libSM libICE libXpm libXp + ]; - phaseNames = ["doXMKMF" "doMakeInstall"]; + buildPhase = ''xmkmf && make World''; - doXMKMF = a.fullDepEntry ('' - xmkmf - '') ["doUnpack" "minInit" "addInputs"]; + installPhase = '' + make DESTDIR=$out BINDIR=/bin MANDIR=/share/man/man1 install install.man + ''; - name = "vncrec-0.2"; # version taken from Arch AUR meta = { description = "VNC recorder"; homepage = http://ronja.twibright.com/utils/vncrec/; - maintainers = [ - ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 587836edd1ca..337959e3141c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3342,7 +3342,11 @@ let vnc2flv = callPackage ../tools/video/vnc2flv {}; - vncrec = builderDefsPackage (callPackage ../tools/video/vncrec) {}; + vncrec = callPackage ../tools/video/vncrec { + inherit (xlibs) imake libX11 xproto gccmakedep libXt + libXmu libXaw libXext xextproto libSM libICE libXpm + libXp; + }; vobcopy = callPackage ../tools/cd-dvd/vobcopy { };