diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/development/libraries/libayatana-common/default.nix | |
parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libayatana-common/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libayatana-common/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix b/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix index 216e05f6709c..439cc45031f9 100644 --- a/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix +++ b/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix @@ -4,11 +4,11 @@ , gitUpdater , testers , cmake -, cmake-extras , glib , gobject-introspection , gtest , intltool +, lomiri , pkg-config , systemd , vala @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # Queries via pkg_get_variable, can't override prefix substituteInPlace data/CMakeLists.txt \ - --replace 'DESTINATION "''${SYSTEMD_USER_UNIT_DIR}"' 'DESTINATION "${placeholder "out"}/lib/systemd/user"' + --replace 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemd_user_unit_dir)' 'set(SYSTEMD_USER_UNIT_DIR ''${CMAKE_INSTALL_PREFIX}/lib/systemd/user)' ''; strictDeps = true; @@ -42,8 +42,9 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - cmake-extras + lomiri.cmake-extras glib + lomiri.lomiri-url-dispatcher systemd ]; @@ -53,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" - "-DENABLE_LOMIRI_FEATURES=OFF" + "-DENABLE_LOMIRI_FEATURES=ON" "-DGSETTINGS_LOCALINSTALL=ON" "-DGSETTINGS_COMPILE=ON" ]; |