JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cimg: fix paths and unbreak overrides

Browse Source
This commit is contained in:
michael bishop 2017-04-24 09:16:51 -03:00
parent cc4649ddb4
commit 0e9a01355a
No known key found for this signature in database
GPG Key ID: C294FC1A485A409A
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 { stdenv, fetchurl, unzip }:
, unzip }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +12,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ unzip ]; 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" ]; outputs = [ "out" "doc" ];