diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-09-12 08:14:37 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-09-12 08:14:37 +0000 |
commit | 7d648ac22d941d0c7efdd987315ae0ddf9932ba0 (patch) | |
tree | 51a3e8126722c5a52a9a1e7e40b4eeaf4610db0b /nixpkgs/pkgs/desktops/lomiri | |
parent | aa4353b499e6950b7333578f936455a628145c31 (diff) | |
parent | db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b (diff) | |
download | nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.gz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.bz2 nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.lz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.xz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.zst nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/desktops/lomiri')
-rw-r--r-- | nixpkgs/pkgs/desktops/lomiri/development/geonames/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/desktops/lomiri/development/geonames/default.nix b/nixpkgs/pkgs/desktops/lomiri/development/geonames/default.nix index b3ee9dc25ef7..ee4a3b77b72b 100644 --- a/nixpkgs/pkgs/desktops/lomiri/development/geonames/default.nix +++ b/nixpkgs/pkgs/desktops/lomiri/development/geonames/default.nix @@ -36,16 +36,16 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withExamples [ "bin" ] ++ lib.optionals withDocumentation [ - "doc" + "devdoc" ]; patches = [ # Improves install locations of demo & docs # Remove when https://gitlab.com/ubports/development/core/geonames/-/merge_requests/3 merged & in release (fetchpatch { - name = "0001-geonames-Use-GNUInstallDirs-more.patch"; - url = "https://gitlab.com/OPNA2608/geonames/-/commit/e64a391fc213b2629da1c8bbf975fd62a2973c51.patch"; - hash = "sha256-HPYDtIy1WUrZLPzvKh4aezrT/LniZkNX+PeQ9YB85RY="; + name = "0001-geonames-Use-CMAKE_INSTALL_BINDIR-for-install.patch"; + url = "https://gitlab.com/OPNA2608/geonames/-/commit/3bca6d4d02843aed851a0a7480d5cd5ac02b4cda.patch"; + hash = "sha256-vwffuMKpIqymYaiGEvnNeVXLmnz5e4aBpg55fnNbjKs="; }) ]; |