From 16c2ec2ef16627246de3424320030d182ff9784b Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sun, 13 Jan 2008 18:08:51 +0000 Subject: [PATCH] kino not finding dll fix. Now you can start it svn path=/nixpkgs/trunk/; revision=10138 --- pkgs/applications/video/kino/default.nix | 42 +++++------------------- pkgs/top-level/all-packages.nix | 8 +++-- 2 files changed, 14 insertions(+), 36 deletions(-) diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 9f3863e9fad3..8e501f40cc0e 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -2,6 +2,7 @@ #--enable-udev-rules-dir=PATH # Where to install udev rules (/etc/udev/rules.d) +#TODO shared version? # This is my config output.. Much TODO ? @@ -54,13 +55,15 @@ args: args.stdenv.mkDerivation { name = "kino-1.2.0"; + phases = "unpackPhase configurePhase buildPhase installPhase"; + src = args.fetchurl { url = http://downloads.sourceforge.net/kino/kino-1.2.0.tar.gz; sha256 = "15q1qmii5a2zbrrrg8iba2d1rjzaisa75zvxjhrs86jwglpn4lp9"; }; buildInputs =(with args; [ gtk libglade libxml2 libraw1394 libsamplerate libdv - pkgconfig perl perlXMLParser libavc1394 libiec61883 x11 libXv gettext libX11]); # TODOoptional packages + pkgconfig perl perlXMLParser libavc1394 libiec61883 x11 libXv gettext libX11 glib cairo ]); # TODOoptional packages #preConfigure = " # grep 11 env-vars @@ -68,13 +71,14 @@ args.stdenv.mkDerivation { #"; postInstall = " + rpath=`patchelf --print-rpath \$out/bin/kino`; for i in $\buildInputs; do echo adding \$i/lib - rpath=\$rpath:\$i/lib + rpath=\$rpath\${rpath:+:}\$i/lib + done + for i in \$out/bin/*; do + patchelf --set-rpath \"\$rpath\" \"\$i\" done - echo \$buildInputs - echo \$rpath - patchelf --set-rpath \"\$rpath\" \"\$out/bin/\"* "; @@ -84,31 +88,3 @@ args.stdenv.mkDerivation { license = "GPL2"; }; } - -/* -# is this configure option of interest? -#--enable-udev-rules-dir=PATH -# Where to install udev rules (/etc/udev/rules.d) -args: -( args.mkDerivationByConfiguration { - flagConfig = { - # TODO optional packages - - }; - - extraAttrs = co : { - name = "kino-1.2.0"; - - src = args.fetchurl { - url = http://downloads.sourceforge.net/kino/kino-1.2.0.tar.gz; - sha256 = "15q1qmii5a2zbrrrg8iba2d1rjzaisa75zvxjhrs86jwglpn4lp9"; - }; - - meta = { - description = "Kino is a non-linear DV editor for GNU/Linux"; - homepage = http://www.kinodv.org/; - license = "GPL2"; - }; - }; -} ) args -*/ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a86770841dd1..0f0d0539839e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4203,11 +4203,13 @@ rec { }; kino = import ../applications/video/kino { - inherit fetchurl stdenv pkgconfig libxml2 perl perlXMLParser - libdv libraw1394 libavc1394 libiec61883 x11 gettext; /* libavformat */ + stdenv = stdenvUsingSetupNew2; + inherit fetchurl pkgconfig libxml2 perl perlXMLParser + libdv libraw1394 libavc1394 libiec61883 x11 gettext cairo; /* libavformat */ inherit libsamplerate ffmpeg; - inherit (gnome) libglade gtk; + inherit (gnome) libglade gtk glib; inherit (xlibs) libXv libX11; + inherit (gtkLibs) pango; # # optional # inherit ffmpeg2theora sox, vorbis-tools lame mjpegtools dvdauthor 'Q'dvdauthor growisofs mencoder;