diff options
author | Profpatsch <mail@profpatsch.de> | 2018-07-22 17:03:19 +0200 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2018-07-25 00:06:31 +0200 |
commit | 710f0f8c1091d5156b609b6e0035ba09c943bbe3 (patch) | |
tree | a6c9d01fd27d694e94fa992f65d5c5df64c90779 /pkgs/development/libraries | |
parent | e56b97fcf1d63cf428112c5392274af49ab781f2 (diff) | |
download | nixlib-710f0f8c1091d5156b609b6e0035ba09c943bbe3.tar nixlib-710f0f8c1091d5156b609b6e0035ba09c943bbe3.tar.gz nixlib-710f0f8c1091d5156b609b6e0035ba09c943bbe3.tar.bz2 nixlib-710f0f8c1091d5156b609b6e0035ba09c943bbe3.tar.lz nixlib-710f0f8c1091d5156b609b6e0035ba09c943bbe3.tar.xz nixlib-710f0f8c1091d5156b609b6e0035ba09c943bbe3.tar.zst nixlib-710f0f8c1091d5156b609b6e0035ba09c943bbe3.zip |
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.
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/skalibs/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
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"; |