BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #153073 from prusnak/cleanup-mkDerivationWith

Browse source 
librecad+qcad: use mkDerivation instead of mkDerivationWith
This commit is contained in:
Pavol Rusnak 2022-01-01 15:29:24 +01:00 committed by GitHub
commit d7efed0ddb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/misc/librecad/default.nix
View file

@ -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";

5
pkgs/applications/misc/qcad/default.nix
View file

@ -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";