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

Merge pull request #30067 from dtzWill/update/caneda-0.3.1

Browse Source 
caneda: git-2012-02-16 -> 0.3.1
This commit is contained in:
Jörg Thalheim 2017-10-04 17:57:08 +01:00 committed by GitHub
commit b6b5eaa802
2 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pkgs/applications/science/electronics/caneda/default.nix
View File

@ -1,37 +1,20 @@
{stdenv, fetchgit, qt4, cmake, libxml2, libxslt}:
let
srcComponents = fetchgit {
url = git://caneda.git.sourceforge.net/gitroot/caneda/components;
rev = "34cd36b620e0dfc57ba2d2b6168734ea9a2cfa9a";
sha256 = "840f07921eecbf10e38e44e5c61c716295a16c98fbb75016d9a44e7dfee40e59";
};
in
{stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }:
stdenv.mkDerivation rec {
name = "caneda-git-2012-02-16";
name = "caneda-${version}";
version = "0.3.1";
src = fetchgit {
url = git://caneda.git.sourceforge.net/gitroot/caneda/caneda;
rev = "fff9e2f7988fe5d062548cafeda1e5cd660769d1";
sha256 = "dfbcac97f5a1b41ad9a63392394f37fb294cbf78c576673c9bc4a5370957b2c8";
src = fetchFromGitHub {
owner = "Caneda";
repo = "Caneda";
rev = version;
sha256 = "0hx8qid50j9xvg2kpbpqmbdyakgyjn6m373m1cvhp70v2gp1v8l2";
};
hardeningDisable = [ "format" ];
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase qttools qtsvg qwt ];
buildInputs = [ cmake qt4 libxml2 libxslt ];
patches = [
./gcc6.patch
];
postInstall = ''
mkdir $out/share/caneda/components
cp -R ${srcComponents}/* $out/share/caneda/components
chmod u+w -R $out/share/caneda/components
'';
enableParallelBuilding = true;
meta = {
description = "Open source EDA software focused on easy of use and portability";

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

@ -18632,7 +18632,7 @@ with pkgs;
eagle = callPackage ../applications/science/electronics/eagle { };
caneda = callPackage ../applications/science/electronics/caneda { };
caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { };
geda = callPackage ../applications/science/electronics/geda {
guile = guile_2_0;