From 43012a8149bf42b97fdde20f356009e53a209ef1 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 17 Oct 2024 11:40:55 +0200 Subject: [PATCH] qgis: re-export unwrapped parameters Re-export build configuration parameters from unwrapped package to allow standard override using ``` qgis.override { ... }; ``` . --- pkgs/applications/gis/qgis/default.nix | 9 ++++++++- pkgs/applications/gis/qgis/ltr.nix | 9 ++++++++- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 ++-- pkgs/applications/gis/qgis/unwrapped.nix | 4 ++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 5e22cc9aa016..c90a372681a3 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,9 +5,16 @@ , extraPythonPackages ? (ps: [ ]) , libsForQt5 + +# unwrapped package parameters +, withGrass ? true +, withWebKit ? false }: let - qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix { }; + qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix { + withGrass = withGrass; + withWebKit = withWebKit; + }; in symlinkJoin rec { inherit (qgis-unwrapped) version; diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix index 53e6069e8707..56a15dbd7ddb 100644 --- a/pkgs/applications/gis/qgis/ltr.nix +++ b/pkgs/applications/gis/qgis/ltr.nix @@ -5,9 +5,16 @@ , extraPythonPackages ? (ps: [ ]) , libsForQt5 + +# unwrapped package parameters +, withGrass ? true +, withWebKit ? false }: let - qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix { }; + qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix { + withGrass = withGrass; + withWebKit = withWebKit; + }; in symlinkJoin rec { inherit (qgis-ltr-unwrapped) version; diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 17af854eabda..98caf348ae80 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -6,8 +6,8 @@ , wrapGAppsHook3 , wrapQtAppsHook -, withGrass ? true -, withWebKit ? false +, withGrass +, withWebKit , bison , cmake diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 97349b31845b..49d0fd5b366e 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -6,8 +6,8 @@ , wrapGAppsHook3 , wrapQtAppsHook -, withGrass ? true -, withWebKit ? false +, withGrass +, withWebKit , bison , cmake