Merge pull request #62708 from ktor/bcompare-4.2.10.23938

bcompare: init at 4.2.10.23938
This commit is contained in:
worldofpeace 2019-08-24 11:38:42 -04:00 committed by GitHub
commit a980a2c3ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 73 additions and 0 deletions

View file

@ -3385,6 +3385,11 @@
githubId = 10544;
name = "Giuluo Eulisse";
};
ktor = {
email = "kruszewsky@gmail.com";
github = "ktor";
name = "Pawel Kruszewski";
};
ktosiek = {
email = "tomasz.kontusz@gmail.com";
github = "ktosiek";

View file

@ -0,0 +1,66 @@
{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qt511, qtbase, stdenv, runtimeShell }:
stdenv.mkDerivation rec {
pname = "bcompare";
version = "4.2.10.23938";
src = fetchurl {
url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb";
sha256 = "1825s1lbaj20d712czmaaqg7mkwfb650r53af2y30j29p6yd4wal";
};
unpackPhase = ''
ar x $src
tar xfz data.tar.gz
'';
installPhase = ''
mkdir -p $out/bin $out/lib $out/share
cp -R usr/share $out/
cp -R usr/lib $out/
cp -R usr/bin $out/
# Remove library that refuses to be autoPatchelf'ed
rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so
substituteInPlace $out/bin/bcompare \
--replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \
--replace "/bin/bash" "${runtimeShell}"
# Create symlink bzip2 library
ln -s ${bzip2.out}/lib/libbz2.so.1 $out/lib/beyondcompare/libbz2.so.1.0
'';
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [
stdenv.cc.cc.lib
gtk2
gnome2.pango
cairo
kio
kservice
ki18n
kcoreaddons
gdk-pixbuf
qt4
bzip2
];
dontBuild = true;
dontConfigure = true;
meta = with stdenv.lib; {
description = "GUI application that allows to quickly and easily compare files and folders";
longDescription = ''
Beyond Compare is focused. Beyond Compare allows you to quickly and easily compare your files and folders.
By using simple, powerful commands you can focus on the differences you're interested in and ignore those you're not.
You can then merge the changes, synchronize your files, and generate reports for your records.
'';
homepage = "https://www.scootersoftware.com";
license = licenses.unfree;
maintainers = [ maintainers.ktor ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -24811,6 +24811,8 @@ in
tsung = callPackage ../applications/networking/tsung {};
bcompare = libsForQt5.callPackage ../applications/version-management/bcompare {};
qmk_firmware = callPackage ../development/misc/qmk_firmware {
avrgcc = pkgsCross.avr.buildPackages.gcc;
avrbinutils = pkgsCross.avr.buildPackages.binutils;