From 710f0f8c1091d5156b609b6e0035ba09c943bbe3 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 22 Jul 2018 17:03:19 +0200
Subject: skarnet software: rename attributes and split outputs

Change the attribute names of camelCased utils to kebab-case to improve
consistency.
Split every package into multiple outputs where possible.
---
 pkgs/development/libraries/skalibs/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 29cc477a279d..01eda4890d11 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -14,15 +14,18 @@ in stdenv.mkDerivation rec {
     sha256 = "0skdv3wff1i78hb0y771apw0cak5rzxbwbh6l922snfm01z9k1ws";
   };
 
+  outputs = [ "lib" "dev" "doc" "out" ];
+
   dontDisableStatic = true;
 
   enableParallelBuilding = true;
 
   configureFlags = [
     "--enable-force-devr"       # assume /dev/random works
-    "--libdir=\${prefix}/lib"
-    "--includedir=\${prefix}/include"
-    "--sysdepdir=\${prefix}/lib/skalibs/sysdeps"
+    "--libdir=\${lib}/lib"
+    "--dynlibdir=\${lib}/lib"
+    "--includedir=\${dev}/include"
+    "--sysdepdir=\${lib}/lib/skalibs/sysdeps"
   ]
   ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
   # On darwin, the target triplet from -dumpmachine includes version number, but
@@ -32,6 +35,11 @@ in stdenv.mkDerivation rec {
   # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
   ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
 
+  postInstall = ''
+    mkdir -p $doc/share/doc/skalibs
+    mv doc $doc/share/doc/skalibs/html
+  '';
+
   meta = {
     homepage = http://skarnet.org/software/skalibs/;
     description = "A set of general-purpose C programming libraries";
-- 
cgit 1.4.1