alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #25177 from cleverca22/cimg

Browse source 
cimg: fix paths and unbreak overrides
This commit is contained in:
Michael Raskin 2017-04-30 23:13:34 +02:00 committed by GitHub
parent 17a8227c3c 0e9a01355a
commit 39f55e7c2b
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/cimg/builder.sh
View file

@ -1,11 +0,0 @@
source $stdenv/setup
unpackPhase
cd $sourceRoot
install -dm 755 $out/include/cimg $doc/share/doc/cimg/html $doc/share/cimg/examples $doc/share/cimg/plugins
install -m 644 CImg.h $out/include/cimg
cp -dr --no-preserve=ownership examples/* $doc/share/cimg/examples/
cp -dr --no-preserve=ownership plugins/* $doc/share/cimg/plugins/

12
pkgs/development/libraries/cimg/default.nix
View file

@ -1,5 +1,4 @@
{ stdenv, fetchurl
, unzip }:
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
@ -13,7 +12,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ unzip ];
builder = ./builder.sh;
installPhase = ''
install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples
install -m 644 CImg.h $out/include/
cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/
cp -dr --no-preserve=ownership plugins/* $out/include/CImg/plugins/
cp README.txt $doc/share/doc/cimg/
'';
outputs = [ "out" "doc" ];