Merge pull request #32526 from andir/rawtherapee-git-removal

rawtherapee-git: remove `-git` version
This commit is contained in:
Orivej Desh 2017-12-09 22:19:45 +00:00 committed by GitHub
commit 8e2f912b65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 42 deletions

View File

@ -1,37 +0,0 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau
, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx
}:
stdenv.mkDerivation rec {
name = "rawtherapee-git-2016-10-10";
src = fetchFromGitHub {
owner = "Beep6581";
repo = "RawTherapee";
rev = "0821eea7b6a4ac2fce1fcf644e06078e161e41e3";
sha256 = "1nwb6b1qrpdyigwig7bvr42lf7na1ngm0q2cislcvb2v1nmk6nlz";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ];
NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result";
# Copy generated ReleaseInfo.cmake so we don't need git. File was
# generated manually using `./tools/generateReleaseInfo` in the
# source folder. Make sure to regenerate it when updating.
preConfigure = ''
cp ${./ReleaseInfo.cmake} ./ReleaseInfo.cmake
'';
enableParallelBuilding = true;
meta = {
description = "RAW converter and digital photo processing software";
homepage = http://www.rawtherapee.com/;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ viric jcumming mahe the-kenny ];
platforms = with stdenv.lib.platforms; linux;
};
}

View File

@ -16516,11 +16516,6 @@ with pkgs;
cmake = cmake_2_8; # problems after 3.4 -> 3.6.0
};
rawtherapee-git = lowPrio (callPackage ../applications/graphics/rawtherapee/dev.nix {
fftw = fftwSinglePrec;
cmake = cmake_2_8; # problems after 3.4 -> 3.6.0
});
rclone = callPackage ../applications/networking/sync/rclone { };
rcs = callPackage ../applications/version-management/rcs { };