summary refs log tree commit diff
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2023-09-13 06:26:48 -0500
committerGitHub <noreply@github.com>2023-09-13 06:26:48 -0500
commit0b1df30f478aa1b0cbe9a25faf9faf87a37219e4 (patch)
treeae69539e5562efcd93ceb3ace48c093185fb1b98
parent87917096e8c858b59e1ef81dfcb356b2f970ee56 (diff)
parentd75f9285f735e06462bab3dd149cc99bbbe691c4 (diff)
downloadnixpkgs-0b1df30f478aa1b0cbe9a25faf9faf87a37219e4.tar
nixpkgs-0b1df30f478aa1b0cbe9a25faf9faf87a37219e4.tar.gz
nixpkgs-0b1df30f478aa1b0cbe9a25faf9faf87a37219e4.tar.bz2
nixpkgs-0b1df30f478aa1b0cbe9a25faf9faf87a37219e4.tar.lz
nixpkgs-0b1df30f478aa1b0cbe9a25faf9faf87a37219e4.tar.xz
nixpkgs-0b1df30f478aa1b0cbe9a25faf9faf87a37219e4.tar.zst
nixpkgs-0b1df30f478aa1b0cbe9a25faf9faf87a37219e4.zip
Merge pull request #245926 from trofi/taglib-update
taglib: 0.13.0 -> 0.13.1
-rw-r--r--pkgs/development/libraries/taglib/default.nix12
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix
index 0fb207e4e0f..6eaab962341 100644
--- a/pkgs/development/libraries/taglib/default.nix
+++ b/pkgs/development/libraries/taglib/default.nix
@@ -7,20 +7,26 @@
 
 stdenv.mkDerivation rec {
   pname = "taglib";
-  version = "1.13";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "taglib";
     repo = "taglib";
     rev = "v${version}";
-    sha256 = "sha256-DRALRH+/7c2lBvCpLp8hop3Xxsf76F1q8L7F9qehqQA=";
+    hash = "sha256-QX0EpHGT36UsgIfRf5iALnwxe0jjLpZvCTbk8vSMFF4=";
   };
 
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ zlib ];
 
-  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    # Workaround unconditional ${prefix} until upstream is fixed:
+    #   https://github.com/taglib/taglib/issues/1098
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+  ];
 
   meta = with lib; {
     homepage = "https://taglib.org/";