From f28924173eceb6c9e17a458ccd893f6f8aa51ef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 5 Oct 2015 22:47:22 +0200 Subject: [PATCH] libvpx: split into multiple outputs Rather an easy one, it seems. --- pkgs/development/libraries/libvpx/default.nix | 5 +++++ pkgs/development/libraries/libvpx/git.nix | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 6a475667078..c33c5d9ad01 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -72,6 +72,9 @@ stdenv.mkDerivation rec { patchPhase = ''patchShebangs .''; + outputs = [ "dev" "out" "bin" ]; + setOutputFlags = false; + configureFlags = [ (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8") (enableFeature vp8EncoderSupport "vp8-encoder") @@ -146,6 +149,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = ''_moveToOutput bin "$bin" ''; + crossAttrs = let isCygwin = stdenv.cross.libc == "msvcrt"; isDarwin = stdenv.cross.libc == "libSystem"; diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix index 31b1c197e9f..bfe1f9424cd 100644 --- a/pkgs/development/libraries/libvpx/git.nix +++ b/pkgs/development/libraries/libvpx/git.nix @@ -73,6 +73,9 @@ stdenv.mkDerivation rec { patchPhase = ''patchShebangs .''; + outputs = [ "dev" "out" "bin" ]; + setOutputFlags = false; + configureFlags = [ (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8") (enableFeature vp8EncoderSupport "vp8-encoder") @@ -147,6 +150,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = ''_moveToOutput bin "$bin" ''; + crossAttrs = let isCygwin = stdenv.cross.libc == "msvcrt"; isDarwin = stdenv.cross.libc == "libSystem";