diff options
| author | Thomas Tuegel <thomas.tuegel@runtimeverification.com> | 2020-09-07 11:20:28 -0500 |
|---|---|---|
| committer | Thomas Tuegel <thomas.tuegel@runtimeverification.com> | 2020-09-07 11:20:28 -0500 |
| commit | d1e022773d55a163a77af72e1af4a6f59452f9ed (patch) | |
| tree | 8e05d254749ba45cd4123acb56c8a1053569744d | |
| parent | c0c73c1f2105902c7fcb1a64d74cc4a785a2a70d (diff) | |
| download | nixpkgs-d1e022773d55a163a77af72e1af4a6f59452f9ed.tar nixpkgs-d1e022773d55a163a77af72e1af4a6f59452f9ed.tar.gz nixpkgs-d1e022773d55a163a77af72e1af4a6f59452f9ed.tar.bz2 nixpkgs-d1e022773d55a163a77af72e1af4a6f59452f9ed.tar.lz nixpkgs-d1e022773d55a163a77af72e1af4a6f59452f9ed.tar.xz nixpkgs-d1e022773d55a163a77af72e1af4a6f59452f9ed.tar.zst nixpkgs-d1e022773d55a163a77af72e1af4a6f59452f9ed.zip | |
dxflib: move to libsForQt5
| -rw-r--r-- | pkgs/development/libraries/dxflib/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index e1cb8d2d9e2..1b63d8805fd 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, qt5 +, qmake }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "09yjgzh8677pzkkr7a59pql5d11451c22pxksk2my30mapxsri96"; }; nativeBuildInputs = [ - qt5.qmake + qmake ]; preConfigure = '' sed -i 's/CONFIG += staticlib/CONFIG += shared/' dxflib.pro @@ -42,4 +42,3 @@ stdenv.mkDerivation rec { description = ''DXF file format library''; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c32886d646c..1a4c0af0795 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12138,8 +12138,6 @@ in duckdb = callPackage ../development/libraries/duckdb {}; - dxflib = callPackage ../development/libraries/dxflib {}; - easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; eccodes = callPackage ../development/libraries/eccodes { @@ -14898,6 +14896,8 @@ in appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; + dxflib = callPackage ../development/libraries/dxflib {}; + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; qgpgme = callPackage ../development/libraries/gpgme { }; |