diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-07-07 23:04:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-07 23:04:57 +0200 |
| commit | 23261c3f38e7752f686d9f9232161a4507cbcceb (patch) | |
| tree | 6c64e9fddd7d046d9c7e176b9eab3b5fcdb36757 /pkgs/development/libraries | |
| parent | e1f193aeaff5d22f93a33334de6e730d98cd384c (diff) | |
| parent | 0e81850754fdc276165adc5ca51737da986b667d (diff) | |
| download | nixpkgs-23261c3f38e7752f686d9f9232161a4507cbcceb.tar nixpkgs-23261c3f38e7752f686d9f9232161a4507cbcceb.tar.gz nixpkgs-23261c3f38e7752f686d9f9232161a4507cbcceb.tar.bz2 nixpkgs-23261c3f38e7752f686d9f9232161a4507cbcceb.tar.lz nixpkgs-23261c3f38e7752f686d9f9232161a4507cbcceb.tar.xz nixpkgs-23261c3f38e7752f686d9f9232161a4507cbcceb.tar.zst nixpkgs-23261c3f38e7752f686d9f9232161a4507cbcceb.zip | |
Merge pull request #124417 from Mindavi/atk/clean-up-cross
atk: clean up cross-compilation logic
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/atk/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 38c55731698..08e6e5b0e41 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib , fixDarwinDylibNames, gobject-introspection, gnome -, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform }: let @@ -18,9 +17,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkg-config gettext glib ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames - ++ lib.optional withIntrospection gobject-introspection; + nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ # Required by atk.pc @@ -34,7 +32,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dintrospection=${lib.boolToString withIntrospection}" + "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" ]; doCheck = true; |