diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-04-30 23:13:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-30 23:13:34 +0200 |
| commit | 39f55e7c2bce6fe9d0f4491b29c8357314517652 (patch) | |
| tree | 6bc6cb6d317d4c4848bfca060cbbf520195d0e28 | |
| parent | 17a8227c3cb99173cf37a37c9553f11abe5e53c8 (diff) | |
| parent | 0e9a01355afa388ec71b2ccfaeac236dfb1d20fe (diff) | |
| download | nixlib-39f55e7c2bce6fe9d0f4491b29c8357314517652.tar nixlib-39f55e7c2bce6fe9d0f4491b29c8357314517652.tar.gz nixlib-39f55e7c2bce6fe9d0f4491b29c8357314517652.tar.bz2 nixlib-39f55e7c2bce6fe9d0f4491b29c8357314517652.tar.lz nixlib-39f55e7c2bce6fe9d0f4491b29c8357314517652.tar.xz nixlib-39f55e7c2bce6fe9d0f4491b29c8357314517652.tar.zst nixlib-39f55e7c2bce6fe9d0f4491b29c8357314517652.zip | |
Merge pull request #25177 from cleverca22/cimg
cimg: fix paths and unbreak overrides
| -rw-r--r-- | pkgs/development/libraries/cimg/builder.sh | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/cimg/default.nix | 12 |
2 files changed, 9 insertions, 14 deletions
diff --git a/pkgs/development/libraries/cimg/builder.sh b/pkgs/development/libraries/cimg/builder.sh deleted file mode 100644 index 6473395493c3..000000000000 --- a/pkgs/development/libraries/cimg/builder.sh +++ /dev/null @@ -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/ diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index a9470ee3f41b..c294647b35de 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -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" ]; |