diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/tools/package-management/packagekit | |
parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/tools/package-management/packagekit')
-rw-r--r-- | nixpkgs/pkgs/tools/package-management/packagekit/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/package-management/packagekit/qt.nix | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/tools/package-management/packagekit/default.nix b/nixpkgs/pkgs/tools/package-management/packagekit/default.nix index 05877979e9c5..b62597e7e508 100644 --- a/nixpkgs/pkgs/tools/package-management/packagekit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/packagekit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, lib -, intltool, glib, pkgconfig, polkit, python3, sqlite +, intltool, glib, pkg-config, polkit, python3, sqlite , gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ sqlite boost ] ++ lib.optional enableNixBackend nix; - nativeBuildInputs = [ vala intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; + nativeBuildInputs = [ vala intltool pkg-config autoreconfHook autoconf-archive gtk-doc ]; preAutoreconf = '' gtkdocize diff --git a/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix b/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix index 2a1ebada0020..f87ce8258fa0 100644 --- a/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix +++ b/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkg-config , qttools, packagekit }: stdenv.mkDerivation rec { @@ -14,9 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ packagekit ]; - nativeBuildInputs = [ cmake pkgconfig qttools ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkg-config qttools ]; meta = packagekit.meta // { description = "System to facilitate installing and updating packages - Qt"; |