calamares-nixos-extensions: simplify derivation

bobvanderlinden · Feb 27, 2022 · c34a688 · c34a688
1 parent c43b2b2
commit c34a688
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 23 deletions.
diff --git a/pkgs/tools/misc/calamares-nixos-extensions/default.nix b/pkgs/tools/misc/calamares-nixos-extensions/default.nix
@@ -1,10 +1,7 @@
-{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore
-, kservice, libatasmart, libxcb, libyamlcpp, libpwquality, parted, polkit-qt, python, qtbase
-, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata
-, ckbcomp, xkeyboard_config, mkDerivation, calamares-nixos
+{ stdenv, lib, fetchurl
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "calamares-nixos-extensions";
   version = "0.0.1";
 
@@ -13,20 +10,12 @@ mkDerivation rec {
     sha256 = "sha256-Ua7NJXwu9QsWrTzRKMPQnlkr7lECBNAKBRjD6bwCHa8=";
   };
 
-  nativeBuildInputs = [ cmake extra-cmake-modules ];
-  buildInputs = [
-    boost kparts.dev kpmcore.out kservice.dev
-    libatasmart libxcb libyamlcpp libpwquality parted polkit-qt python
-    qtbase qtquickcontrols qtsvg qttools qtwebengine.dev util-linux calamares-nixos
-  ];
-
-  cmakeFlags = [
-    "-DPYTHON_LIBRARY=${python}/lib/lib${python.libPrefix}.so"
-    "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}"
-    "-DCMAKE_VERBOSE_MAKEFILE=True"
-    "-DCMAKE_BUILD_TYPE=Release"
-    "-DWITH_PYTHONQT:BOOL=ON"
-  ];
+  installPhase = ''
+    mkdir -p $out/{lib,share}/calamares
+    cp -r modules $out/lib/calamares/
+    cp -r config/* $out/share/calamares/
+    cp -r branding $out/share/calamares/
+  '';
 
   meta = with lib; {
     description = "Calamares modules for NixOS";

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -2487,10 +2487,7 @@ with pkgs;
     boost = boost.override { enablePython = true; python = python3; };
   };
   calamares-nixos = lowPrio (calamares.override { nixos-extensions = true; });
-  calamares-nixos-extensions = libsForQt515.callPackage ../tools/misc/calamares-nixos-extensions {
-    python = python3;
-    boost = boost.override { enablePython = true; python = python3; };
-  };
+  calamares-nixos-extensions = callPackage ../tools/misc/calamares-nixos-extensions {};
 
   calendar-cli = callPackage ../tools/networking/calendar-cli { };