diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 16:41:51 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 16:41:51 +0200 |
| commit | 1858a39c9a61b177acdb11e0728903bcdea90457 (patch) | |
| tree | 67e0963bc7299b0243b3b396d9590a7a53d614bc /pkgs/development/libraries/apr | |
| parent | 9d19ac7d0d27e9e7da6b46afcd6543d9002f48d8 (diff) | |
| download | nixpkgs-1858a39c9a61b177acdb11e0728903bcdea90457.tar nixpkgs-1858a39c9a61b177acdb11e0728903bcdea90457.tar.gz nixpkgs-1858a39c9a61b177acdb11e0728903bcdea90457.tar.bz2 nixpkgs-1858a39c9a61b177acdb11e0728903bcdea90457.tar.lz nixpkgs-1858a39c9a61b177acdb11e0728903bcdea90457.tar.xz nixpkgs-1858a39c9a61b177acdb11e0728903bcdea90457.tar.zst nixpkgs-1858a39c9a61b177acdb11e0728903bcdea90457.zip | |
apr: don't manually move apr-1-config
Also refactor meta.
Diffstat (limited to 'pkgs/development/libraries/apr')
| -rw-r--r-- | pkgs/development/libraries/apr/default.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 74994223e0f..c6e505f43d2 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 ]; }; } |