diff options
Diffstat (limited to 'pkgs/development/libraries/zvbi')
-rw-r--r--[-rwxr-xr-x] | pkgs/development/libraries/zvbi/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/zvbi/default.nix | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/libraries/zvbi/builder.sh b/pkgs/development/libraries/zvbi/builder.sh index a123b16dce28c..379ad847fae51 100755..100644 --- a/pkgs/development/libraries/zvbi/builder.sh +++ b/pkgs/development/libraries/zvbi/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$x11 $libpng" . $stdenv/setup || exit 1 diff --git a/pkgs/development/libraries/zvbi/default.nix b/pkgs/development/libraries/zvbi/default.nix index 54de0c92816a5..6ba67e642234e 100644 --- a/pkgs/development/libraries/zvbi/default.nix +++ b/pkgs/development/libraries/zvbi/default.nix @@ -4,15 +4,13 @@ assert x11 != null; assert pngSupport -> libpng != null; -derivation { +stdenv.mkDerivation { name = "zvbi-0.2.5"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zvbi-0.2.5.tar.bz2; md5 = "06b370565246758813f6580797369518"; }; - stdenv = stdenv; x11 = x11; pngSupport = pngSupport; libpng = if pngSupport then libpng else null; |