diff --git a/pkgs/development/libraries/stduuid/default.nix b/pkgs/by-name/st/stduuid/package.nix similarity index 51% rename from pkgs/development/libraries/stduuid/default.nix rename to pkgs/by-name/st/stduuid/package.nix index c7e31c990087..af9ea3763981 100644 --- a/pkgs/development/libraries/stduuid/default.nix +++ b/pkgs/by-name/st/stduuid/package.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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca9d31b36480..eaba80f5715d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24601,8 +24601,6 @@ with pkgs; stb = callPackage ../development/libraries/stb { }; - stduuid = callPackage ../development/libraries/stduuid { }; - steghide = callPackage ../tools/graphics/steghide { }; stegsolve = callPackage ../tools/graphics/stegsolve { };