Merge pull request #153073 from prusnak/cleanup-mkDerivationWith

librecad+qcad: use mkDerivation instead of mkDerivationWith
2022-01-01 15:29:24 +01:00
parent 16fd7864cb 24e93afb05
commit d7efed0ddb
2 changed files with 4 additions and 6 deletions
@@ -2,7 +2,7 @@
 , boost
 , fetchFromGitHub
 , installShellFiles
-, mkDerivationWith
+, mkDerivation
 , muparser
 , pkg-config
 , qmake
@@ -10,10 +10,9 @@
 , qtsvg
 , qttools
 , runtimeShell
-, stdenv
 }:

-mkDerivationWith stdenv.mkDerivation rec {
+mkDerivation rec {
  pname = "librecad";
  version = "2.2.0-rc2";

@@ -1,7 +1,7 @@
 { boost
 , fetchFromGitHub
 , libGLU
-, mkDerivationWith
+, mkDerivation
 , muparser
 , pkg-config
 , qtbase
@@ -11,11 +11,10 @@
 , qtxmlpatterns
 , qttools
 , lib
-, stdenv
 , installShellFiles
 }:

-mkDerivationWith stdenv.mkDerivation rec {
+mkDerivation rec {
  pname = "qcad";
  version = "3.26.4.10";