packagekit: disable nix backend
This commit is contained in:
parent
2ecd8cbbc5
commit
a519bddf0d
|
@ -10,7 +10,6 @@
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, vala
|
, vala
|
||||||
, gtk-doc
|
, gtk-doc
|
||||||
, nix
|
|
||||||
, boost
|
, boost
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
|
@ -48,7 +47,6 @@ stdenv.mkDerivation rec {
|
||||||
gst_all_1.gst-plugins-base
|
gst_all_1.gst-plugins-base
|
||||||
gtk3
|
gtk3
|
||||||
sqlite
|
sqlite
|
||||||
nix
|
|
||||||
boost
|
boost
|
||||||
] ++ lib.optional enableSystemd systemd
|
] ++ lib.optional enableSystemd systemd
|
||||||
++ lib.optional enableBashCompletion bash-completion;
|
++ lib.optional enableBashCompletion bash-completion;
|
||||||
|
@ -69,7 +67,10 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
(if enableSystemd then "-Dsystemd=true" else "-Dsystem=false")
|
(if enableSystemd then "-Dsystemd=true" else "-Dsystem=false")
|
||||||
"-Dpackaging_backend=nix"
|
# often fails to build with nix updates
|
||||||
|
# and remounts /nix/store as rw
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/177946
|
||||||
|
#"-Dpackaging_backend=nix"
|
||||||
"-Ddbus_sys=${placeholder "out"}/share/dbus-1/system.d"
|
"-Ddbus_sys=${placeholder "out"}/share/dbus-1/system.d"
|
||||||
"-Ddbus_services=${placeholder "out"}/share/dbus-1/system-services"
|
"-Ddbus_services=${placeholder "out"}/share/dbus-1/system-services"
|
||||||
"-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
|
"-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
|
||||||
|
|
|
@ -10390,7 +10390,7 @@ with pkgs;
|
||||||
|
|
||||||
p7zip = callPackage ../tools/archivers/p7zip { };
|
p7zip = callPackage ../tools/archivers/p7zip { };
|
||||||
|
|
||||||
packagekit = callPackage ../tools/package-management/packagekit { nix = nixVersions.nix_2_8; };
|
packagekit = callPackage ../tools/package-management/packagekit { };
|
||||||
|
|
||||||
packetdrill = callPackage ../tools/networking/packetdrill { };
|
packetdrill = callPackage ../tools/networking/packetdrill { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue