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

Keep 'librecad2' attribute, for backwards compatibility.

2 files changed, 16 insertions, 50 deletions

diff --git a/pkgs/applications/misc/librecad/2.0.nix b/pkgs/applications/misc/librecad/2.0.nix
deleted file mode 100644
index 135291a14905..000000000000
--- a/pkgs/applications/misc/librecad/2.0.nix
+++ /dev/null
@@ -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;
-  };
-}
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index b2960e9f47d4..135291a14905 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -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;