From 9e5b4e9edefbc903b6a0593220f78de2182ccebc Mon Sep 17 00:00:00 2001 From: Olivier Le Doeuff Date: Sat, 27 Apr 2024 23:44:05 +0200 Subject: [PATCH 1/2] stduuid: fix cmake version stduuid reported the wrong version to cmake, causing `find_package(stduuid 1.2.3)` to fail (but `find_package(stduuid 1.0)` was working which is NOT expected. Patch is from this [PR](https://github.com/mariusbancila/stduuid/pull/79). This will need to be updated if `stduuid` is getting maintained again one day. --- pkgs/development/libraries/stduuid/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/stduuid/default.nix b/pkgs/development/libraries/stduuid/default.nix index c7e31c990087..af9ea3763981 100644 --- a/pkgs/development/libraries/stduuid/default.nix +++ b/pkgs/development/libraries/stduuid/default.nix @@ -1,7 +1,8 @@ -{ stdenv, cmake, fetchFromGitHub, lib }: let +{ stdenv, cmake, fetchFromGitHub, fetchpatch, lib }: let version = "1.2.3"; in stdenv.mkDerivation { - name = "stduuid-${version}"; + pname = "stduuid"; + inherit version; src = fetchFromGitHub { owner = "mariusbancila"; @@ -12,6 +13,15 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; + patches = [ + # stduuid report version 1.0 instead of 1.2.3 for cmake's find_package to properly work + # If version is updated one day, this patch will need to be updated + (fetchpatch { + url = "https://github.com/OlivierLDff/stduuid/commit/b02c70c0a4bef2c82152503e13c9a67d6631b13d.patch"; + hash = "sha256-tv4rllhngdgjXX35kcM69yXo0DXF/BQ+AUbiC1gJIU8="; + }) + ]; + meta = { description = "A C++17 cross-platform implementation for UUIDs"; license = lib.licenses.mit; From 4d9be9dc7d38fca1b8174146b457e70fd77a34cf Mon Sep 17 00:00:00 2001 From: Olivier Le Doeuff Date: Mon, 29 Apr 2024 16:48:53 +0200 Subject: [PATCH 2/2] stduuid: migrate to by-name --- .../stduuid/default.nix => by-name/st/stduuid/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/stduuid/default.nix => by-name/st/stduuid/package.nix} (100%) diff --git a/pkgs/development/libraries/stduuid/default.nix b/pkgs/by-name/st/stduuid/package.nix similarity index 100% rename from pkgs/development/libraries/stduuid/default.nix rename to pkgs/by-name/st/stduuid/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaa23105da40..8b5eae0a1f18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24617,8 +24617,6 @@ with pkgs; stb = callPackage ../development/libraries/stb { }; - stduuid = callPackage ../development/libraries/stduuid { }; - steghide = callPackage ../tools/graphics/steghide { }; stegsolve = callPackage ../tools/graphics/stegsolve { };