From 710f0f8c1091d5156b609b6e0035ba09c943bbe3 Mon Sep 17 00:00:00 2001 From: Profpatsch 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/tools/misc/execline/default.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'pkgs/tools/misc/execline/default.nix') diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 6a13d289efc0..26cd9112f58d 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -14,22 +14,32 @@ in stdenv.mkDerivation rec { sha256 = "1q0izb8ajzxl36fjpy4rn63sz01055r9s33fga99jprdmkkfzz6x"; }; + outputs = [ "bin" "lib" "dev" "doc" "out" ]; + dontDisableStatic = true; enableParallelBuilding = true; configureFlags = [ "--enable-absolute-paths" - "--libdir=\${prefix}/lib" - "--includedir=\${prefix}/include" - "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" - "--with-include=${skalibs}/include" - "--with-lib=${skalibs}/lib" - "--with-dynlib=${skalibs}/lib" + "--libdir=\${lib}/lib" + "--dynlibdir=\${lib}/lib" + "--bindir=\${bin}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-dynlib=${skalibs.lib}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); + postInstall = '' + mkdir -p $doc/share/doc/execline + mv doc $doc/share/doc/execline/html + mv examples $doc/share/doc/execline/examples + ''; + meta = { homepage = http://skarnet.org/software/execline/; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; -- cgit 1.4.1