darktable: move documentation to it's own directory #72160

roosemberth · 2019-10-28T12:06:13Z

Motivation for this change

Package documentation in the wrong directory. Creates collisions when merging system paths.

Things done

Notify maintainers

cc @

Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>

mrVanDalo

No functional tests needed, because documentation is just moved around. And it builds, so all good I would say.

mrVanDalo

No functional tests needed, because documentation is just moved around. And it builds, so all good I would say.

nixos-discourse · 2020-03-11T06:09:18Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/113

jtojnar

This looks like a bug in CMake setup hook. It should be fixed there instead.

The issue is that $shareDocName

nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh

Line 80 in 6bba942

    
           cmakeFlags="-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName} $cmakeFlags"

is only defined when using multiple outputs:

nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh

Lines 55 to 67 in 6bba942

    
           if [ -z "$shareDocName" ]; then 
        
               local confScript="$configureScript" 
        
               if [ -z "$confScript" ] && [ -x ./configure ]; then 
        
                   confScript=./configure 
        
               fi 
        
               if [ -f "$confScript" ]; then 
        
                   local shareDocName="$(sed -n "s/^PACKAGE_TARNAME='\(.*\)'$/\1/p" < "$confScript")" 
        
               fi 
        
                                           # PACKAGE_TARNAME sometimes contains garbage. 
        
               if [ -n "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-]'; then 
        
                   shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')" 
        
               fi 
        
           fi

To fix that here, I suggest adding outputs = [ "out" "doc" ]; between pname and src.

Edit: Opened an issue about the underlying problem: #82304

jtojnar · 2020-03-11T08:40:24Z

It is more complicated than that, see #82304. For now you can set shareDocName manually.

This reverts commit 730133e. multiple-outputs.sh has been fixed, so documentation is now corrrrectly installed under $out/share/doc/darktable. Fixes: NixOS#72160 Fixes: NixOS#83248

jtojnar · 2020-07-19T07:36:17Z

The change was actually reverted, #93166 is a proper fix.

darktable: move documentation to it's own directory

1d58de6

Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>

ofborg bot requested review from flosse, cillianderoiste and mrVanDalo October 28, 2019 12:21

ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Oct 28, 2019

mrVanDalo approved these changes Oct 28, 2019

View reviewed changes

jtojnar requested changes Mar 11, 2020

View reviewed changes

mrVanDalo mentioned this pull request Mar 24, 2020

darktable, wireshark: Fix documentation installation directory #83248

Closed

jtojnar mentioned this pull request Jun 22, 2020

stdenv: fix backward multiple outputs conditional #91277

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

darktable: move documentation to it's own directory #72160

darktable: move documentation to it's own directory #72160

roosemberth commented Oct 28, 2019

mrVanDalo left a comment

mrVanDalo left a comment

nixos-discourse commented Mar 11, 2020

jtojnar left a comment •

edited

Loading

jtojnar commented Mar 11, 2020

jtojnar commented Jul 19, 2020

	if [ -z "$shareDocName" ]; then
	local confScript="$configureScript"
	if [ -z "$confScript" ] && [ -x ./configure ]; then
	confScript=./configure
	fi
	if [ -f "$confScript" ]; then
	local shareDocName="$(sed -n "s/^PACKAGE_TARNAME='\(.*\)'$/\1/p" < "$confScript")"
	fi
	# PACKAGE_TARNAME sometimes contains garbage.
	if [ -n "$shareDocName" ] \|\| echo "$shareDocName" \| grep -q '[^a-zA-Z0-9_-]'; then
	shareDocName="$(echo "$name" \| sed 's/-[^a-zA-Z].*//')"
	fi
	fi

darktable: move documentation to it's own directory #72160

darktable: move documentation to it's own directory #72160

Conversation

roosemberth commented Oct 28, 2019

Motivation for this change

Things done

Notify maintainers

mrVanDalo left a comment

Choose a reason for hiding this comment

mrVanDalo left a comment

Choose a reason for hiding this comment

nixos-discourse commented Mar 11, 2020

jtojnar left a comment • edited Loading

Choose a reason for hiding this comment

jtojnar commented Mar 11, 2020

jtojnar commented Jul 19, 2020

jtojnar left a comment •

edited

Loading