diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2015-06-15 14:57:44 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2015-11-24 14:45:15 +0100 |
| commit | b3144ea2873cc1487a3d5e0d633df38474adcb2c (patch) | |
| tree | 905ebf825d2291a5f840e8bf30e10be7df64c46c | |
| parent | f40e36d213a813420735701e10b723ae1e3e4ab7 (diff) | |
| download | nixpkgs-b3144ea2873cc1487a3d5e0d633df38474adcb2c.tar nixpkgs-b3144ea2873cc1487a3d5e0d633df38474adcb2c.tar.gz nixpkgs-b3144ea2873cc1487a3d5e0d633df38474adcb2c.tar.bz2 nixpkgs-b3144ea2873cc1487a3d5e0d633df38474adcb2c.tar.lz nixpkgs-b3144ea2873cc1487a3d5e0d633df38474adcb2c.tar.xz nixpkgs-b3144ea2873cc1487a3d5e0d633df38474adcb2c.tar.zst nixpkgs-b3144ea2873cc1487a3d5e0d633df38474adcb2c.zip | |
directvnc: reimplement using mkDerivation
| -rw-r--r-- | pkgs/os-specific/linux/directvnc/default.nix | 33 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 17 insertions, 20 deletions
diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index b6f221b8ea4..4c47104c5b6 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -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 - ]; -in -rec { - src = a.fetchUrlFromSrcInfo s; +{ stdenv, fetchurl, pkgconfig, directfb, zlib, libjpeg, xproto }: - inherit (s) name; - inherit buildInputs; - configureFlags = []; +stdenv.mkDerivation rec { + name="directvnc-${version}"; + version="0.7.5-test-051207"; - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; + src = fetchurl { + url = "http://directvnc-rev.googlecode.com/files/directvnc-${version}.tar.gz"; + sha256 = "1is9hca8an1b1n8436wkv7s08ml5lb95f7h9vznx9br597f106w9"; + }; + buildInputs = [ + pkgconfig directfb zlib libjpeg xproto + ]; + 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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 337959e3141..9dedd8c3bd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;}; |