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

opustags: init at 1.3.0 #101536

Merged
merged 1 commit into from Oct 24, 2020
Merged

opustags: init at 1.3.0 #101536

merged 1 commit into from Oct 24, 2020

Conversation

kmein
Copy link
Member

@kmein kmein commented Oct 24, 2020

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To fix building on darwin and some little cleanup:

From 625232281d8868267770c143017051baddad7058 Mon Sep 17 00:00:00 2001
From: user <user@iMac.local>
Date: Sat, 24 Oct 2020 14:36:51 +0200
Subject: [PATCH] Fix build on darwin

---
 pkgs/applications/audio/opustags/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix
index 36b9e0eb86d3..24d02c6ee0f5 100644
--- a/pkgs/applications/audio/opustags/default.nix
+++ b/pkgs/applications/audio/opustags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, pkgconfig, libogg, fetchFromGitHub }:
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, libogg, libiconv }:
 stdenv.mkDerivation rec {
   name = "opustags";
   version = "1.3.0";
@@ -16,9 +16,10 @@ stdenv.mkDerivation rec {

   buildInputs = [ libogg ];

-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig ]
+    ++ lib.optional stdenv.isDarwin libiconv;

-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/fmang/opustags";
     description = "Ogg Opus tags editor";
     platforms = platforms.all;
--
2.28.0

@Lassulus Lassulus merged commit a020c1b into NixOS:master Oct 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants