diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-05-27 17:12:43 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-05-27 17:27:24 +0000 |
commit | f005272623abfb9eb470b0317a9d18250daa3526 (patch) | |
tree | 5fa2e8a30024503abb29fff61917e48739546550 /pkgs/development/libraries/wayland | |
parent | 162c0c3e6100461b5ed59144e6a69c179dfde84a (diff) | |
download | nixpkgs-f005272623abfb9eb470b0317a9d18250daa3526.tar nixpkgs-f005272623abfb9eb470b0317a9d18250daa3526.tar.gz nixpkgs-f005272623abfb9eb470b0317a9d18250daa3526.tar.bz2 nixpkgs-f005272623abfb9eb470b0317a9d18250daa3526.tar.lz nixpkgs-f005272623abfb9eb470b0317a9d18250daa3526.tar.xz nixpkgs-f005272623abfb9eb470b0317a9d18250daa3526.tar.zst nixpkgs-f005272623abfb9eb470b0317a9d18250daa3526.zip |
wayland: Simplify cross build
Now that we have a pkg-config wrapper, we can get build-time deps via pkg-config.
Diffstat (limited to 'pkgs/development/libraries/wayland')
-rw-r--r-- | pkgs/development/libraries/wayland/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch | 14 |
2 files changed, 4 insertions, 17 deletions
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index e3b2941e8ee..402177b899c 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -23,16 +23,17 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Ddocumentation=${lib.boolToString withDocumentation}" ]; - patches = lib.optional isCross ./fix-wayland-cross-compilation.patch; - postPatch = lib.optionalString withDocumentation '' patchShebangs doc/doxygen/gen-doxygen.py - '' + lib.optionalString isCross '' substituteInPlace egl/meson.build --replace \ "find_program('nm').path()" \ "find_program('${stdenv.cc.targetPrefix}nm').path()" ''; + depsBuildBuild = [ + pkgconfig + ]; + nativeBuildInputs = [ meson pkgconfig ninja ] ++ lib.optionals isCross [ diff --git a/pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch b/pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch deleted file mode 100644 index 77639acb653..00000000000 --- a/pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/meson.build b/src/meson.build -index 3e8c9bf..75241cb 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -55,8 +55,7 @@ pkgconfig.generate( - ) - - if meson.is_cross_build() -- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') -- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) -+ wayland_scanner_for_build = find_program('wayland-scanner', native: true, version: '>=1.14.0') - else - wayland_scanner_for_build = wayland_scanner - endif |