Unverified Commit 1383c900 authored by Shea Levy's avatar Shea Levy Committed by GitHub
Browse files

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

stduuid: fix cmake version
parents 437ce9ad 4d9be9dc

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

+12 −2
Original line number Diff line number Diff line 
{ 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;

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -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 { };