Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

stduuid: fix cmake version #307320

Merged
merged 2 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down