diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-11-05 09:32:31 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-11-05 09:32:31 +0100 |
commit | 480416cc0d7e508b652c516af8d7342e3b1e59e3 (patch) | |
tree | d64d990b0d7cc1f80dca687b48563bc71628b55e /nixpkgs/pkgs/applications/misc/glom/default.nix | |
parent | 05f40ff2bfe9c68198664c38d65816f677ac7ed4 (diff) | |
parent | fa804edfb7869c9fb230e174182a8a1a7e512c40 (diff) | |
download | nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar.gz nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar.bz2 nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar.lz nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar.xz nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar.zst nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD
Conflicts: nixpkgs/pkgs/servers/pr-tracker/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/glom/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/glom/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/applications/misc/glom/default.nix b/nixpkgs/pkgs/applications/misc/glom/default.nix index 363e6fadee41..5c8eb94712a6 100644 --- a/nixpkgs/pkgs/applications/misc/glom/default.nix +++ b/nixpkgs/pkgs/applications/misc/glom/default.nix @@ -28,7 +28,7 @@ , isocodes , gtksourceview , gtksourceviewmm -, postgresql_11 +, postgresql_15 , gobject-introspection , yelp-tools , wrapGAppsHook @@ -93,7 +93,7 @@ in stdenv.mkDerivation rec { python3.pkgs.pygobject3 gtksourceview gtksourceviewmm - postgresql_11 # for pg_config + postgresql_15 # for postgresql utils ]; enableParallelBuilding = true; @@ -102,6 +102,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-boost-python=boost_python${lib.versions.major python3.version}${lib.versions.minor python3.version}" + "--with-postgres-utils=${lib.getBin postgresql_15}/bin" ]; makeFlags = [ |