summary refs log tree commit diff
diff options
context:
space:
mode:
authorOPNA2608 <christoph.neidahl@gmail.com>2023-11-12 21:21:40 +0100
committerOPNA2608 <christoph.neidahl@gmail.com>2023-11-12 21:21:41 +0100
commit427d085756583df00689c2188c715c8479739e1a (patch)
tree2abba818c94686eb9aa4ea7774e619247ef167bb
parente7bf1e3ec443d255a722fbc0451163d3564ec8b6 (diff)
downloadnixpkgs-427d085756583df00689c2188c715c8479739e1a.tar
nixpkgs-427d085756583df00689c2188c715c8479739e1a.tar.gz
nixpkgs-427d085756583df00689c2188c715c8479739e1a.tar.bz2
nixpkgs-427d085756583df00689c2188c715c8479739e1a.tar.lz
nixpkgs-427d085756583df00689c2188c715c8479739e1a.tar.xz
nixpkgs-427d085756583df00689c2188c715c8479739e1a.tar.zst
nixpkgs-427d085756583df00689c2188c715c8479739e1a.zip
libsForQt5.qmltermwidget: Minor cleanups
- Clarify license
- Replace INSTALL_ROOT with proper $$PREFIX usage
- Minor style stuff
-rw-r--r--pkgs/development/libraries/qmltermwidget/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 7f096c8858a..b84460b4df1 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -1,9 +1,9 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, qmake
 , qtbase
 , qtquick1
-, qmake
 , qtmultimedia
 , utmp
 }:
@@ -13,13 +13,15 @@ stdenv.mkDerivation {
   version = "unstable-2022-01-09";
 
   src = fetchFromGitHub {
-    repo = "qmltermwidget";
     owner = "Swordfish90";
+    repo = "qmltermwidget";
     rev = "63228027e1f97c24abb907550b22ee91836929c5";
     hash = "sha256-aVaiRpkYvuyomdkQYAgjIfi6a3wG2a6hNH1CfkA2WKQ=";
   };
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [
+    qmake
+  ];
 
   buildInputs = [
     qtbase
@@ -34,17 +36,15 @@ stdenv.mkDerivation {
 
   postPatch = ''
     substituteInPlace qmltermwidget.pro \
-      --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/"
+      --replace '$$[QT_INSTALL_QML]' '$$PREFIX/${qtbase.qtQmlPrefix}/'
   '';
 
-  installFlags = [ "INSTALL_ROOT=${placeholder "out"}" ];
-
   dontWrapQtApps = true;
 
   meta = {
     description = "A QML port of qtermwidget";
     homepage = "https://github.com/Swordfish90/qmltermwidget";
-    license = lib.licenses.gpl2;
+    license = lib.licenses.gpl2Plus;
     platforms = with lib.platforms; linux ++ darwin;
     maintainers = with lib.maintainers; [ OPNA2608 ];
   };