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

librecad: remove old 1.x, make 2.x default

Browse Source 
Keep 'librecad2' attribute, for backwards compatibility.
This commit is contained in:
Bjørn Forsman 2015-10-21 14:43:52 +02:00
parent 8a23fb0ffc
commit 10c0791142
3 changed files with 17 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/applications/misc/librecad/2.0.nix
View File

@ -1,41 +0,0 @@
{ stdenv, fetchurl, qt4, muparser, which, boost, pkgconfig }:
stdenv.mkDerivation rec {
version = "2.0.8";
name = "librecad-${version}";
src = fetchurl {
url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}";
name = name + ".tar.gz";
sha256 = "110vn1rvzidg8k6ifz1zws2wsn4cd05xl5ha0hbff2ln7izy84zc";
};
patchPhase = ''
sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp
'';
configurePhase = ''
qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost.dev}
'';
installPhase = ''
mkdir -p $out/bin $out/share
cp -R unix/librecad $out/bin
cp -R unix/resources $out/share/librecad
'';
buildInputs = [ qt4 muparser which boost ];
nativeBuildInputs = [ pkgconfig ];
enableParallelBuilding = true;
meta = {
description = "A 2D CAD package based upon Qt";
homepage = http://librecad.org;
repositories.git = git://github.com/LibreCAD/LibreCAD.git;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

25
pkgs/applications/misc/librecad/default.nix
View File

@ -1,20 +1,23 @@
{ stdenv, fetchurl, qt4, muparser, which}:
{ stdenv, fetchurl, qt4, muparser, which, boost, pkgconfig }:
stdenv.mkDerivation {
name = "librecad-1.0.4";
stdenv.mkDerivation rec {
version = "2.0.8";
name = "librecad-${version}";
src = fetchurl {
url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.4;
name = "librecad-1.0.4.tar.gz";
sha256 = "00nzbijw7pn1zkj4256da501xcm6rkcvycpa79y6dr2p6c43yc6m";
url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}";
name = name + ".tar.gz";
sha256 = "110vn1rvzidg8k6ifz1zws2wsn4cd05xl5ha0hbff2ln7izy84zc";
};
patchPhase = ''
sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
sed -i -e s,/usr/share,$out/share, src/lib/engine/rs_system.cpp
sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp
'';
configurePhase = "qmake PREFIX=$out";
configurePhase = ''
qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost.dev}
'';
installPhase = ''
mkdir -p $out/bin $out/share
@ -22,11 +25,15 @@ stdenv.mkDerivation {
cp -R unix/resources $out/share/librecad
'';
buildInputs = [ qt4 muparser which ];
buildInputs = [ qt4 muparser which boost ];
nativeBuildInputs = [ pkgconfig ];
enableParallelBuilding = true;
meta = {
description = "A 2D CAD package based upon Qt";
homepage = http://librecad.org;
repositories.git = git://github.com/LibreCAD/LibreCAD.git;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;

3
pkgs/top-level/all-packages.nix
View File

@ -12033,8 +12033,7 @@ let
libowfat = callPackage ../development/libraries/libowfat { };
librecad = callPackage ../applications/misc/librecad { };
librecad2 = callPackage ../applications/misc/librecad/2.0.nix { };
librecad2 = librecad; # backwards compatibility alias, added 2015-10
libreoffice = callPackage ../applications/office/libreoffice {
inherit (perlPackages) ArchiveZip CompressZlib;