From 1858a39c9a61b177acdb11e0728903bcdea90457 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 16:41:51 +0200
Subject: apr: don't manually move apr-1-config

Also refactor meta.
---
 pkgs/development/libraries/apr/default.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'pkgs/development/libraries/apr')

diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 74994223e0f47..c6e505f43d231 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
 
   outputs = [ "dev" "out" ];
+  outputBin = "dev";
 
   preConfigure =
     ''
@@ -24,17 +25,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall =
-    ''
-      mkdir $dev/bin $dev/lib
-      mv $out/bin/apr-1-config $dev/bin
-      mv $out/lib/pkgconfig $dev/lib
-    '';
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://apr.apache.org/;
     description = "The Apache Portable Runtime library";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = platforms.all;
+    maintainers = [ maintainers.eelco ];
   };
 }
-- 
cgit 1.4.1