nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #307320 from OlivierLDff/stduuid-version-fix

Browse Source 
stduuid: fix cmake version
This commit is contained in:
Shea Levy 2024-04-29 17:23:24 -05:00 committed by GitHub
commit 1383c90051
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/stduuid/default.nix → pkgs/by-name/st/stduuid/package.nix
View File

@ -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;

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };