diff --git a/pkgs/applications/video/gnash/builder.sh b/pkgs/applications/video/gnash/builder.sh index b24a2cb58409..519007fa55ec 100644 --- a/pkgs/applications/video/gnash/builder.sh +++ b/pkgs/applications/video/gnash/builder.sh @@ -1,5 +1,5 @@ source "$stdenv/setup" || exit 1 -configureFlags="--with-sdl-mixer-incl=$SDL_mixer/include/SDL --with-sdl-incl=$SDL/include/SDL --with-plugindir=$out/plugins --enable-gui=gtk" +configureFlags="--with-sdl-mixer-incl=$SDL_mixer/include/SDL --with-sdl-incl=$SDL/include/SDL --with-npapi-plugindir=$out/plugins --enable-gui=gtk" genericBuild diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 4ca28fb164d6..d83353af4775 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -8,12 +8,13 @@ stdenv.mkDerivation rec { name = "gnash-0.8.2"; - builder = ./builder.sh; src = fetchurl { url = "mirror://gnu/gnash/0.8.2/${name}.tar.bz2"; sha256 = "1akbs0wkgiawrjwwgp5w0cqn0qn3fcnfv40scjlrvdqrcqgfg0ac"; }; + builder = ./builder.sh; + patchPhase = '' # Add all libs to `macros/libslist', a list of library search paths. for lib in ${lib.concatStringsSep " " @@ -30,6 +31,9 @@ stdenv.mkDerivation rec { dbus curl pkgconfig glib gtk]; inherit SDL_mixer SDL; + preInstall = ''ensureDir $out/plugins''; + postInstall = ''make install-plugins''; + meta = { homepage = http://www.gnu.org/software/gnash/; description = ''Gnash is the GNU Flash movie player.'';