opencsg: 1.7.0 -> 1.8.1 (#408854)

pkgs/development/libraries/opencsg/default.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  cmake,
   libGLU,
   libGL,
   libglut,
@@ -9,19 +10,19 @@
   libXmu,
   libXext,
   libX11,
-  qmake,
   fixDarwinDylibNames,
 }:
 
-stdenv.mkDerivation rec {
-  version = "1.7.0";
+stdenv.mkDerivation (finalAttrs: {
   pname = "opencsg";
+  version = "1.8.1";
+
   src = fetchurl {
-    url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz";
-    hash = "sha256-uJLezIGp5nwsTSXFOZ1XbY93w7DAUmBgZ0MkPIZTnfg=";
+    url = "http://www.opencsg.org/OpenCSG-${finalAttrs.version}.tar.gz";
+    hash = "sha256-r8wASontO8R4qeS6ObIPPVibJOI+J1tzg/kaWQ1NV8U=";
   };
 
-  nativeBuildInputs = [ qmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   buildInputs =
     [ glew ]
@@ -36,14 +37,9 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
-  preConfigure = ''
-    rm example/Makefile src/Makefile
-    qmakeFlags=("''${qmakeFlags[@]}" "INSTALLDIR=$out")
-  '';
-
   postInstall =
     ''
-      install -D copying.txt "$out/share/doc/opencsg/copying.txt"
+      install -D ../copying.txt "$out/share/doc/opencsg/copying.txt"
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       mkdir -p $out/Applications
@@ -61,12 +57,12 @@ stdenv.mkDerivation rec {
       $app
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Constructive Solid Geometry library";
     mainProgram = "opencsgexample";
     homepage = "http://www.opencsg.org/";
-    platforms = platforms.unix;
-    maintainers = [ maintainers.raskin ];
-    license = licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.raskin ];
+    license = lib.licenses.gpl2Plus;
   };
-}
+})

pkgs/top-level/all-packages.nix

@@ -9235,9 +9235,7 @@ with pkgs;
     };
   };
 
-  opencsg = callPackage ../development/libraries/opencsg {
-    inherit (qt5) qmake;
-  };
+  opencsg = callPackage ../development/libraries/opencsg { };
 
   opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
     pythonPackages = python3Packages;