1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00

directvnc: reimplement using mkDerivation

This commit is contained in:
Joachim Fasting 2015-06-15 14:57:44 +02:00
parent f40e36d213
commit b3144ea287
2 changed files with 19 additions and 22 deletions

View file

@ -1,26 +1,21 @@
a @ { libjpeg, pkgconfig, zlib, directfb, xproto, ... } :
let
s = import ./src-for-default.nix;
buildInputs = with a; [
directfb zlib libjpeg pkgconfig xproto
{ stdenv, fetchurl, pkgconfig, directfb, zlib, libjpeg, xproto }:
stdenv.mkDerivation rec {
name="directvnc-${version}";
version="0.7.5-test-051207";
src = fetchurl {
url = "http://directvnc-rev.googlecode.com/files/directvnc-${version}.tar.gz";
sha256 = "1is9hca8an1b1n8436wkv7s08ml5lb95f7h9vznx9br597f106w9";
};
buildInputs = [
pkgconfig directfb zlib libjpeg xproto
];
in
rec {
src = a.fetchUrlFromSrcInfo s;
inherit (s) name;
inherit buildInputs;
configureFlags = [];
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
meta = {
description = "DirectFB VNC client";
maintainers = [
a.lib.maintainers.raskin
];
platforms = with a.lib.platforms;
linux;
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = with stdenv.lib.platforms; linux;
};
}

View file

@ -9742,7 +9742,9 @@ let
dietlibc = callPackage ../os-specific/linux/dietlibc { };
directvnc = builderDefsPackage (callPackage ../os-specific/linux/directvnc) {};
directvnc = callPackage ../os-specific/linux/directvnc {
inherit (xlibs) xproto;
};
dmraid = callPackage ../os-specific/linux/dmraid {
devicemapper = devicemapper.override {enable_dmeventd = true;};