From c9b34f760175584e0e77cd84fa2b97e0f060b57d Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 8 Sep 2022 18:28:06 +0300 Subject: [PATCH] treewide: remove unnecessary cmake pkg-config patchs --- pkgs/development/libraries/arrow-cpp/default.nix | 9 --------- pkgs/development/libraries/openal-soft/default.nix | 7 +------ pkgs/development/libraries/orcania/default.nix | 11 +---------- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 1402fc6ed9460..d3b736fbe0f0d 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , fetchFromGitHub , fixDarwinDylibNames , abseil-cpp @@ -113,14 +112,6 @@ stdenv.mkDerivation rec { patches = [ # patch to fix python-test ./darwin.patch - # in master post 8.0.0, see https://github.com/apache/arrow/pull/13182 - (fetchpatch { - name = "fix-pkg-config.patch"; - stripLen = 1; - excludes = [ "src/arrow/engine/arrow-substrait.pc.in" ]; # for < 8.0.0 - url = "https://github.com/apache/arrow/commit/a242eb17362c0352fc3291213542c48abfe18669.patch"; - sha256 = "15gz13f8q75l7d4z5blyvxd805hwfcvrbrxs2kbfal9vcbnirycx"; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 434918c0c87bf..b9471d6819376 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , alsaSupport ? !stdenv.isDarwin, alsa-lib , dbusSupport ? !stdenv.isDarwin, dbus , pipewireSupport ? !stdenv.isDarwin, pipewire @@ -21,11 +21,6 @@ stdenv.mkDerivation rec { # this will make it find its own data files (e.g. HRTF profiles) # without any other configuration ./search-out.patch - # merged after 1.22.0 in https://github.com/kcat/openal-soft/pull/696 - (fetchpatch { - url = "https://github.com/kcat/openal-soft/commit/0bf2abae9b2121c3bc5a56dab30eca308136bc29.patch"; - sha256 = "1fhjjy7nrhrj3a0wlmsqpf8h3ss6s487vz5jrhamyv04nbcahn20"; - }) ]; postPatch = '' substituteInPlace core/helpers.cpp \ diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index 338deafa763ee..abe45b63372f7 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, check, subunit }: +{ lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; version = "2.3.0"; @@ -10,15 +10,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-QAq/6MGVj+iBHLElHuqokF1v3LU1TZ9hVVJE1s3y6f0="; }; - # in master post 2.2.2, see https://github.com/babelouest/orcania/issues/27 - patches = [ - (fetchpatch { - name = "fix-pkg-config.patch"; - url = "https://github.com/babelouest/orcania/commit/4eac7d5ff76bb3bec8250fef300b723c8891552a.patch"; - sha256 = "01bsxay1ca8d08ac3ddcqyvjwgz5mgs68jz5y3gzq4qnzl3q1i54"; - }) - ]; - nativeBuildInputs = [ cmake ]; checkInputs = [ check subunit ];